* docs/grub.cfg: Update.

diff --git a/ChangeLog b/ChangeLog
index 4b7dff5aed190108682ef53c263499cf717285d1..632572a6449e24fddc5df6d1c41f88e6b1c3810b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * docs/grub.cfg: Update.
+
 2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi (PXE): Remove not present variables.

diff --git a/docs/grub.cfg b/docs/grub.cfg
index e14cdb776b82880057cdfdaf5ee8cc03d3284a39..dc184d7d930dfba34571b51d6cb195d01ef60cee 100644 (file)
--- a/docs/grub.cfg
+++ b/docs/grub.cfg
@@ -5,15 +5,22 @@
 # Boot automatically after 30 secs.
 set timeout=30
 
-# By default, boot the first entry.
-set default=0
+# By default, boot the GNU/Linux
+set default=gnulinux
 
-# Fallback to the second entry.
-set fallback=1
+# Fallback to GNU/Hurd.
+set fallback=gnuhurd
+
+# For booting GNU/Linux
+menuentry "GNU/Linux" --id gnulinux {
+       set root=(hd0,msdos1)
+       linux /vmlinuz root=/dev/sda1
+       initrd /initrd.img
+}
 
 # For booting GNU/Hurd
-menuentry "GNU (aka GNU/Hurd)" {
-       set root=(hd0,1)
+menuentry "GNU (aka GNU/Hurd)" --id gnuhurd {
+       set root=(hd0,msdos1)
        multiboot /boot/gnumach.gz root=device:hd0s1
        module /hurd/ext2fs.static ext2fs --readonly \
                        --multiboot-command-line='${kernel-command-line}' \
@@ -24,41 +31,35 @@ menuentry "GNU (aka GNU/Hurd)" {
        module /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
 }
 
-# For booting GNU/Linux
-menuentry "GNU/Linux" {
-       set root=(hd0,1)
-       linux /vmlinuz root=/dev/sda1
-       initrd /initrd.img
-}
-
 # For booting FreeBSD
 menuentry "FreeBSD (or GNU/kFreeBSD), direct boot" {
-       set root=(hd0,1,a)
+       set root=(hd0,msdos1,bsd1)
        kfreebsd /boot/kernel/kernel
        kfreebsd_loadenv /boot/device.hints
        kfreebsd_module /boot/splash.bmp type=splash_image_data
        set kFreeBSD.vfs.root.mountfrom=ufs:ad0s1a
 }
+
 menuentry "FreeBSD (or GNU/kFreeBSD), via /boot/loader" {
-       set root=(hd0,1,a)
+       set root=(hd0,msdos1,bsd1)
        kfreebsd /boot/loader
 }
 
 # For booting NetBSD
 menuentry "NetBSD" {
-       set root=(hd0,1,a)
+       set root=(hd0,netbsd1)
        knetbsd /netbsd
 }
 
 # For booting OpenBSD
 menuentry "OpenBSD" {
-       set root=(hd0,1,a)
+       set root=(hd0,openbsd1)
        kopenbsd /bsd
 }
 
 # For booting Microsoft Windows
 menuentry "Microsoft Windows" {
-       set root=(hd0,1)
+       set root=(hd0,msdos1)
        chainloader +1
 }