From 259d0a6f8b4fac910e5d1a44a288786ce077ef32 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 17 Jun 2005 02:47:45 +0000
Subject: (read_grub) fix reading config with new grub (thus fixing
 detectloader, thus fixing bootloader-config, thus fixing installkernel)

---
 perl-install/bootloader.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install/bootloader.pm')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 9b1157ba9..012921026 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -230,7 +230,11 @@ sub read_grub {
         }
     }
     foreach (cat_("$::prefix/boot/grub/install.sh")) {
-        $b{boot} = grub2dev($1, $grub2dev) if /\s+d\s+(\(.*?\))/;
+        if (/\s+d\s+(\(.*?\))/) {
+            $b{boot} = grub2dev($1, $grub2dev);
+        } elsif (/^setup\s+(\(.*?\))/) {
+            $b{boot} = grub2dev($1, $grub2dev);
+        }
     }
 
     #- sanitize
-- 
cgit v1.2.1