2010-08-23 Samuel Thibault <samuel.thibault@ens-lyon.org>

	* util/grub.d/30_os-prober.in: Fix conversion from grub-probe
	--target=drive output to Mach device name.

diff --git a/ChangeLog b/ChangeLog
index 2db022484bc357e9cada96aa0c3e04bfd7c4a17c..3887cc5bf1ab4ec7a42a776e98715534929990ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-23  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       * util/grub.d/30_os-prober.in: Fix conversion from grub-probe
+       --target=drive output to Mach device name.
+
 2010-08-23  BVK Chaitanya  <bvk.groups@gmail.com>
 
        New Automake based build system for GRUB.

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index ecd87bb1c2da653a9a52a4c9d81fb187708597b5..76857aeeadb51059839a6c27141657ad913738d2 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -179,7 +179,7 @@ EOF
       save_default_entry | sed -e "s/^/\t/"
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
       grub_device="`${grub_probe} --device ${DEVICE} --target=drive`"
-      mach_device="`echo "${grub_device}" | tr -d '()' | tr , s`"
+      mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`"
       grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`"
       case "${grub_fs}" in
        *fs)    hurd_fs="${grub_fs}" ;;