[1758] 2008-08-01 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1758
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1758
Author:   robertmh
Date:     2008-08-01 12:56:56 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
2008-08-01  Robert Millan  <address@hidden>

        * util/grub.d/10_linux.in: Use prepare_grub_to_access_device() from
        within menuentries, not before them.
        util/grub.d/10_hurd.in: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub.d/10_hurd.in
    trunk/grub2/util/grub.d/10_linux.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-08-01 04:06:55 UTC (rev 1757)
+++ trunk/grub2/ChangeLog       2008-08-01 12:56:56 UTC (rev 1758)
@@ -1,3 +1,9 @@
+2008-08-01  Robert Millan  <address@hidden>
+
+       * util/grub.d/10_linux.in: Use prepare_grub_to_access_device() from
+       within menuentries, not before them.
+       util/grub.d/10_hurd.in: Likewise.
+
 2008-08-01  Bean  <address@hidden>
 
        * conf/common.rmk (pkglib_MODULES): Add bufio.mod.

Modified: trunk/grub2/util/grub.d/10_hurd.in
===================================================================
--- trunk/grub2/util/grub.d/10_hurd.in  2008-08-01 04:06:55 UTC (rev 1757)
+++ trunk/grub2/util/grub.d/10_hurd.in  2008-08-01 12:56:56 UTC (rev 1758)
@@ -68,10 +68,11 @@
   exit 1
 fi
 
-prepare_grub_to_access_device ${GRUB_DEVICE}
-
 cat << EOF
 menuentry "${OS}" {
+EOF
+prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+cat << EOF
        multiboot ${kernel} root=device:${GRUB_DEVICE}
        module /hurd/${hurd_fs}.static --readonly \\
                        --multiboot-command-line='\${kernel-command-line}' \\

Modified: trunk/grub2/util/grub.d/10_linux.in
===================================================================
--- trunk/grub2/util/grub.d/10_linux.in 2008-08-01 04:06:55 UTC (rev 1757)
+++ trunk/grub2/util/grub.d/10_linux.in 2008-08-01 12:56:56 UTC (rev 1758)
@@ -97,10 +97,6 @@
         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
       done`
 
-if [ "x$list" != "x" ] ; then
-  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}
-fi
-
 while [ "x$list" != "x" ] ; do
   linux=`find_latest $list`
   echo "Found linux image: $linux" >&2
@@ -128,6 +124,9 @@
 
   cat << EOF
 menuentry "${OS}, linux ${version}" {
+EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+  cat << EOF
        linux   ${rel_dirname}/${basename} 
root=${linux_root_device_thisversion} ro ${GRUB_CMDLINE_LINUX} 
${GRUB_CMDLINE_LINUX_DEFAULT}
 EOF
   if test -n "${initrd}" ; then
@@ -141,6 +140,9 @@
 
   cat << EOF
 menuentry "${OS}, linux ${version} (single-user mode)" {
+EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+  cat << EOF
        linux   ${rel_dirname}/${basename} 
root=${linux_root_device_thisversion} ro single ${GRUB_CMDLINE_LINUX}
 EOF
   if test -n "${initrd}" ; then