2009-11-21 Felix Zielcke <fzielcke@z-51.de>

	Patch from Loïc Minier <loic.minier@ubuntu.com>.
	* util/grub.d/30_os-prober.in: Cope with Linux entries where
	root and /boot are on different devices.

diff --git a/ChangeLog b/ChangeLog
index 34518b011b3730eb5bccd93b31c3aac7483ebf9a..345ea8ae2ecbe3e5983655171b06e75694cdbbb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
+
+       Patch from Loïc Minier <loic.minier@ubuntu.com>.
+       * util/grub.d/30_os-prober.in: Cope with Linux entries where
+       root and /boot are on different devices.
+
 2009-11-21  Carles Pina i Estany <carles@pina.cat>
 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
 

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index c5728866cdcc4e0310c187195ee706ffb89ce946..7301bbedb14b52d6d000f3b16481d0f4323a2709 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -88,11 +88,16 @@ EOF
           LLABEL="${LONGNAME}"
         fi
 
+       if [ "${LROOT}" != "${LBOOT}" ]; then
+         LKERNEL="${LKERNEL#/boot}"
+         LINITRD="${LINITRD#/boot}"
+       fi
+
         cat << EOF
 menuentry "${LLABEL} (on ${DEVICE})" {
 EOF
        if [ -z "${prepare_boot_cache}" ]; then
-         prepare_boot_cache="$(prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/")"
+         prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | sed -e "s/^/\t/")"
        fi
        printf '%s\n' "${prepare_boot_cache}"
        cat <<  EOF