* docs/grub.texi (Multi-boot manual config): Use --set. Improve remark.

diff --git a/ChangeLog b/ChangeLog
index 9161b4f16ce3727c3b82ef16861b1d6aa55b0a32..7c59faa01d207065446ba41cd85e07a8c9a48434 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * docs/grub.texi (Multi-boot manual config): Use --set. Improve remark.
+
 2012-06-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/mm.c (grub_free): Fix agglomerating of free regions.

diff --git a/docs/grub.texi b/docs/grub.texi
index 26944ac8506770da5d55ac5a63cd1b894b9620a9..996857c8528abb07177e95abdb3ab3a68db399d3 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1516,33 +1516,33 @@ Then write grub.cfg as following in /mnt/boot/grub/grub.cfg:
 
 menuentry "OS using grub2" @{
    insmod xfs
-   search -s root -l OS1 --hint hd0,gpt2
+   search --set=root -l OS1 --hint hd0,gpt2
    configfile /boot/grub/grub.cfg
 @}
 
 menuentry "OS using grub2-legacy" @{
    insmod ext2
-   search -s root -l OS2 --hint hd0,gpt3
+   search --set=root -l OS2 --hint hd0,gpt3
    legacy_configfile /boot/grub/menu.lst
 @}
 
 menuentry "Windows XP" @{
    insmod ntfs
-   search -s root -l WINDOWS_XP --hint hd0,gpt4
+   search --set=root -l WINDOWS_XP --hint hd0,gpt4
    gptsync hd0 4+7
    ntldr /ntldr
 @}
 
 menuentry "Windows 7" @{
    insmod ntfs
-   search -s root -l WINDOWS_7 --hint hd0,gpt5
+   search --set=root -l WINDOWS_7 --hint hd0,gpt5
    gptsync hd0 5+7
    ntldr /bootmgr
 @}
 
 menuentry "FreeBSD" @{
           insmod zfs
-          search -s root -l freepool --hint hd0,gpt6
+          search --set=root -l freepool --hint hd0,gpt6
           kfreebsd /freebsd@@/boot/kernel/kernel
           kfreebsd_module_elf /freebsd@@/boot/kernel/opensolaris.ko
           kfreebsd_module_elf /freebsd@@/boot/kernel/zfs.ko
@@ -1552,24 +1552,24 @@ menuentry "FreeBSD" @{
 @}
 
 menuentry "experimental GRUB" @{
-          search -s root -l GRUB --hint hd0,gpt1
+          search --set=root -l GRUB --hint hd0,gpt1
           multiboot /experimental/grub/i386-pc/core.img
 @}
 
 menuentry "Fedora 16 install" @{
-          search -s root -l GRUB --hint hd0,gpt1
+          search --set=root -l GRUB --hint hd0,gpt1
           linux /fedora/vmlinuz lang=en_US keymap=sg resolution=1280x800
           initrd /fedora/initrd.img
 @}
 
 menuentry "Fedora rawhide install" @{
-          search -s root -l GRUB --hint hd0,gpt1
+          search --set=root -l GRUB --hint hd0,gpt1
           linux /fedora/vmlinuz repo=ftp://mirror.switch.ch/mirror/fedora/linux/development/rawhide/x86_64 lang=en_US keymap=sg resolution=1280x800
           initrd /fedora/initrd.img
 @}
 
 menuentry "Debian sid install" @{
-          search -s root -l GRUB --hint hd0,gpt1
+          search --set=root -l GRUB --hint hd0,gpt1
           linux /debian/dists/sid/main/installer-amd64/current/images/hd-media/vmlinuz
           initrd /debian/dists/sid/main/installer-amd64/current/images/hd-media/initrd.gz
 @}
@@ -1578,7 +1578,7 @@ menuentry "Debian sid install" @{
 
 Notes:
 @itemize
-@item Argument to search after -l is FS LABEL. You can also use UUIDs with -u UUID instead of -l LABEL
+@item Argument to search after -l is FS LABEL. You can also use UUIDs with -u UUID instead of -l LABEL. You could also use direct @code{root=hd0,gptX} but this is not recommened due to device name instability.
 @end itemize
 
 @node Embedded configuration