sed off (hdn,n) from the front of an initrd path, as seen in Mandriva/Mageia grub...

diff --git a/debian/changelog b/debian/changelog
index 03f2b49..8dc65b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+os-prober (1.53) UNRELEASED; urgency=low
+
+  * sed off (hdn,n) from the front of an initrd path,
+    as seen in Mandriva/Mageia grub configs.
+    Thanks to François Jaouen and Barry Jackson for the patch
+    Closes: #566102
+
+ -- Christian Perrier <bubulle@debian.org>  Mon, 07 May 2012 22:11:19 +0200
+
 os-prober (1.52) unstable; urgency=low
 
   [ Stéphane Graber ]

diff --git a/linux-boot-probes/mounted/x86/40grub b/linux-boot-probes/mounted/x86/40grub
index b280eac..08f6605 100755 (executable)
--- a/linux-boot-probes/mounted/x86/40grub
+++ b/linux-boot-probes/mounted/x86/40grub
@@ -64,7 +64,9 @@ parse_grub_menu () {
                                fi
                        ;;
                        initrd)
-                               initrd="$2"
+                               # Hack alert take 2: sed off any (hdn,n)
+                               # See #566102
+                               initrd="$(echo "$2" | sed 's/(.*)//')"
                                # Initrd same.
                                if [ "$partition" != "$bootpart" ]; then
                                        initrd="/boot$initrd"