Changeset 7c49e8f in lab.git for TipAndDoc

Timestamp:

May 6, 2012 2:59:31 AM (13 years ago)

Author:

mitty <mitty@…>

Branches:

master, trunk

Children:

95c5c01

Parents:

3a04f86

Message:

• update isos, images
• add Ubuntu 12.04, remove 11.10
• boot FreeDOS directly from images, not from loopback iso

git-svn-id: ​https://lab.mitty.jp/svn/lab/trunk@141 7d2118f6-f56c-43e7-95a2-4bb3031d96e7

File:

• TipAndDoc/boot/grub.cfg (modified) (4 diffs)

TipAndDoc/boot/grub.cfg

@@ -16 +16 @@
 
 menuentry "memtest86+ 4.20" {
-    linux16 /boot/memtest.plus
+    linux16 /boot/memtest.bin
 }
 
-menuentry "Plop Boot Manager 5.0.13" {
+menuentry "Plop Boot Manager 5.0.14" {
     linux16 /boot/plpbt.bin
 }
@@ -34 +34 @@
     loopback loop /boot/iso/debian-squeeze-x86_64.iso
     echo 'Loading Linux 2.6.32-5-amd64 ...'
+    linux (loop)/linux vga=788 initrd=initrd.gz
+    echo 'Loading initrd.gz ...'
+    initrd (loop)/initrd.gz
+}
+
+menuentry "Ubuntu 12.04 (i386) installer" {
+    loopback loop /boot/iso/12.04-i386.iso
+    echo 'Loading Linux 3.2.0-23-generic-pae i386 ...'
+    linux (loop)/linux vga=788 initrd=initrd.gz
+    echo 'Loading initrd.gz ...'
+    initrd (loop)/initrd.gz
+}
+
+menuentry "Ubuntu 12.04 (x86_64) installer" {
+    loopback loop /boot/iso/12.04-x86_64.iso
+    echo 'Loading Linux 3.2.0-23-generic x86_64 ...'
     linux (loop)/linux vga=788 initrd=initrd.gz
     echo 'Loading initrd.gz ...'
@@ -55 +71 @@
 }
 
-menuentry "Ubuntu 11.10 (i386) installer" {
-    loopback loop /boot/iso/11.10-i386.iso
-    echo 'Loading Linux 3.0.0-12-generic i386 ...'
-    linux (loop)/linux vga=normal initrd=initrd.gz
-    echo 'Loading initrd.gz ...'
-    initrd (loop)/initrd.gz
-}
-
-menuentry "Ubuntu 11.10 (x86_64) installer" {
-    loopback loop /boot/iso/11.10-x86_64.iso
-    echo 'Loading Linux 3.0.0-12-generic x86_64 ...'
-    linux (loop)/linux vga=normal initrd=initrd.gz
-    echo 'Loading initrd.gz ...'
-    initrd (loop)/initrd.gz
-}
-
 menuentry "FreeDOS/V V01L38" {
-    loopback loop /boot/iso/fdbasecd.iso
-    linux16 (loop)/isolinux/data/memdisk
+    linux16 /boot/memdisk
     echo 'Loading fdos0138.img ...'
     initrd16 /boot/fdos0138.img
@@ -79 +78 @@
 
 menuentry "FreeDOS 1.0 Final" {
-    loopback loop /boot/iso/fdbasecd.iso
-    linux16 (loop)/isolinux/data/memdisk
+    linux16 /boot/memdisk
     echo 'Loading fdboot.img ...'
-    initrd16 (loop)/isolinux/data/fdboot.img
+    initrd16 /boot/fdboot.img
 }