X-Git-Url: http://lab.mitty.jp/git/?a=blobdiff_plain;f=TipAndDoc%2Fboot%2Fgrub.cfg;h=cd937b05dcc182919217804a59f7a0939af8f14d;hb=refs%2Fheads%2Fmaster;hp=94a5713c0faae885596bee7f744d3bfc8b096f67;hpb=3a04f866516143b8b0d83ded10313b4dda56ff9f;p=lab.git

diff --git a/TipAndDoc/boot/grub.cfg b/TipAndDoc/boot/grub.cfg
index 94a5713..cd937b0 100644
--- a/TipAndDoc/boot/grub.cfg
+++ b/TipAndDoc/boot/grub.cfg
@@ -6,6 +6,14 @@ menuentry "KNOPPIX 6.7.1 CD JAPANESE (text mode)" {
 	initrd (loop)/boot/isolinux/minirt.gz
 }
 
+menuentry "KNOPPIX 6.7.1 CD JAPANESE (text mode vga)" {
+	loopback loop /boot/iso/knoppix_v6.7.1CD_20110914-20111018.iso
+	echo 'Loading Linux 3.0.4 i386 ...'
+	linux (loop)/boot/isolinux/linux 3 bootfrom=/*/*/boot/iso/knoppix_v6.7.1CD_20110914-20111018.iso ramdisk_size=100000 lang=ja vt.default_utf8=0 apm=power-off initrd=minirt.gz nomce libata.force=noncq hpsa.hpsa_allow_any=1 loglevel=1 tz=Asia/Tokyo nomodeset
+	echo 'Loading minirt.gz ...'
+	initrd (loop)/boot/isolinux/minirt.gz
+}
+
 menuentry "KNOPPIX 6.7.1 CD JAPANESE" {
 	loopback loop /boot/iso/knoppix_v6.7.1CD_20110914-20111018.iso
 	echo 'Loading Linux 3.0.4 i386 ...'
@@ -14,11 +22,19 @@ menuentry "KNOPPIX 6.7.1 CD JAPANESE" {
 	initrd (loop)/boot/isolinux/minirt.gz
 }
 
+menuentry "Ubuntu Desktop JAPANESE Remix 12.04" {
+	loopback loop /boot/iso/ubuntu-ja-12.04-desktop-i386.iso
+	echo 'Loading Linux 3.2.0-24-generic-pae ...'
+	linux (loop)/casper/vmlinuz file=/cdrom/preseed/ubuntu.seed boot=casper iso-scan/filename=/boot/iso/ubuntu-ja-12.04-desktop-i386.iso
+	echo 'Loading initrd.lz ...'
+	initrd (loop)/casper/initrd.lz
+}
+
 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
 }
 
@@ -38,48 +54,68 @@ menuentry "Debian 6.0 (x86_64) installer" {
 	initrd (loop)/initrd.gz
 }
 
-menuentry "Ubuntu 10.04 (i386) installer" {
-	loopback loop /boot/iso/10.04-i386.iso
-	echo 'Loading Linux 2.6.32-21-generic i386 ...'
-	linux (loop)/linux vga=normal initrd=initrd.gz
+menuentry "Debian testing (x86_64) installer" {
+	loopback loop /boot/iso/debian-wheezy-x86_64.iso
+	echo 'Loading Linux 3.2.0-2-amd64 ...'
+	linux (loop)/linux vga=788 initrd=initrd.gz
 	echo 'Loading initrd.gz ...'
 	initrd (loop)/initrd.gz
 }
 
-menuentry "Ubuntu 10.04 (x86_64) installer" {
-	loopback loop /boot/iso/10.04-x86_64.iso
-	echo 'Loading Linux 2.6.32-21-generic x86_64 ...'
-	linux (loop)/linux vga=normal initrd=initrd.gz
+menuentry "Ubuntu 12.10 (x86_64) beta installer" {
+	loopback loop /boot/iso/12.10-x86_64-beta.iso
+	echo 'Loading Linux 3.5.0-14-generic x86_64 ...'
+	linux (loop)/linux vga=788 initrd=initrd.gz
 	echo 'Loading initrd.gz ...'
 	initrd (loop)/initrd.gz
 }
 
-menuentry "Ubuntu 11.10 (i386) installer" {
-	loopback loop /boot/iso/11.10-i386.iso
-	echo 'Loading Linux 3.0.0-12-generic i386 ...'
+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 ...'
+	initrd (loop)/initrd.gz
+}
+
+menuentry "Ubuntu 10.04 (i386) installer" {
+	loopback loop /boot/iso/10.04-i386.iso
+	echo 'Loading Linux 2.6.32-21-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 ...'
+menuentry "Ubuntu 10.04 (x86_64) installer" {
+	loopback loop /boot/iso/10.04-x86_64.iso
+	echo 'Loading Linux 2.6.32-21-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
 }
 
 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
-}
\ No newline at end of file
+	initrd16 /boot/fdboot.img
+}
+
+menuentry "Multi Boot Manager R0.39" {
+	linux16 /boot/memdisk
+	echo 'Loading mbm.144 ...'
+	initrd16 /boot/mbm.144
+}