Add support for probing Fedora's location for the GRUB 2 configuration file (closes...

diff --git a/debian/changelog b/debian/changelog
index b35e796..925707a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+os-prober (1.56) UNRELEASED; urgency=low
+
+  [ Hedayat Vatankhah ]
+  * Add support for probing Fedora's location for the GRUB 2 configuration
+    file (closes: #674560).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 17 Sep 2012 16:15:56 +0100
+
 os-prober (1.55) unstable; urgency=low
 
   * Improve detection of Haiku: detect the 64-bit version

diff --git a/linux-boot-probes/mounted/common/40grub2 b/linux-boot-probes/mounted/common/40grub2
index 265d99d..d8ea294 100755 (executable)
--- a/linux-boot-probes/mounted/common/40grub2
+++ b/linux-boot-probes/mounted/common/40grub2
@@ -94,6 +94,9 @@ if [ -e "$mpoint/boot/grub/grub.cfg" ] && \
     [ "$mpoint/boot/grub/grub.cfg" -nt "$mpoint/boot/grub/menu.lst" ]); then
        debug "parsing grub.cfg"
        parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub/grub.cfg"
+elif [ -e "$mpoint/boot/grub2/grub.cfg" ]; then
+       debug "parsing grub.cfg"
+       parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub2/grub.cfg"
 fi
 
 if [ "$found_item" = 0 ]; then