From a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 29 Aug 2005 14:05:22 +0000
Subject: handle parsing of more complicated setup line in install.sh

---
 perl-install/bootloader.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ba29d7896..40ff7af1e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -231,7 +231,7 @@ sub read_grub {
     #- matches either:
     #-   setup (hd0)
     #-   install (hd0,0)/boot/grub/stage1 d (hd0) (hd0,0)/boot/grub/stage2 p (hd0,0)/boot/grub/menu.lst
-    if (cat_("$::prefix/boot/grub/install.sh") =~ /^(?:setup|install\s+(?:\S+)(?:\s+d)?)\s+(\(.*?\))/m) {
+    if (cat_("$::prefix/boot/grub/install.sh") =~ /^(?:setup.*|install\s.*\sd)\s+(\(.*?\))/m) {
 	$b{boot} = grub2dev($1, $grub2dev);
     }
 
-- 
cgit v1.2.1