summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-27 06:40:05 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-27 06:40:05 +0000
commit94bf8374a5ee847592471087fd6090a690c8cff4 (patch)
tree7ca12a5ed008a748ac8e7e2710aed68f0ad86a13
parent47f3c781cf4bcdcedb0c76f101dcb41d38a86a20 (diff)
downloaddrakx-94bf8374a5ee847592471087fd6090a690c8cff4.tar
drakx-94bf8374a5ee847592471087fd6090a690c8cff4.tar.gz
drakx-94bf8374a5ee847592471087fd6090a690c8cff4.tar.bz2
drakx-94bf8374a5ee847592471087fd6090a690c8cff4.tar.xz
drakx-94bf8374a5ee847592471087fd6090a690c8cff4.zip
(read_grub2) read more of grub2 config
(needed for next commit)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm15
-rw-r--r--perl-install/install/NEWS1
3 files changed, 16 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7f1d540cb..321c85543 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- drakboot:
o fix detecting grub2 if there's a remaining grub-legacy signature
+ o read more of grub2 config
Version 15.21 - 26 February 2013
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ccea86a63..f7d13ac5c 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -235,7 +235,20 @@ sub read {
sub read_grub2 {
my %bootloader = getVarsFromSh("$::prefix/boot/grub2/drakboot.conf");
- $bootloader{entries} = [ map { if_(/menuentry\s+['"]([^']+)["']/, { label => $1 }) } cat_("$::prefix/boot/grub2/grub.cfg") ];
+ $bootloader{entries} = [];
+ my $entry;
+ foreach (cat_("$::prefix/boot/grub2/grub.cfg")) {
+ next if /^#/;
+ if (/menuentry\s+['"]([^']+)["']/) {
+ push @{$bootloader{entries}}, $entry if $entry;
+ $entry = { label => $1 };
+ } elsif (/linux\s+(\S+)\s+(.*)?/) {
+ @$entry{qw(kernel_or_dev append)} = ($1, $2);
+ } elsif (/initrd\s+(\S+)/) {
+ $entry->{initrd} = $1;
+ }
+ }
+
$bootloader{method} = 'grub2';
\%bootloader;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f2fdd7c8e..1f5055a68 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- bootloader:
o fix detecting grub2 if there's a remaining grub-legacy signature
+ o read more of grub2 config
- do not attempt to use gurpmi.addmedia or gurpmi if in text mode
Version 15.22 - 26 February 2013