summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-05 11:33:53 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-05 11:33:53 +0000
commit54643229cb7453f41e082a12d1ea927432437b57 (patch)
tree1ed7d396513dd0c412c3bcc0919738ec7b160b50 /perl-install/bootloader.pm
parenta453417ca7a14444345385b177d1b553286a8bd9 (diff)
downloaddrakx-54643229cb7453f41e082a12d1ea927432437b57.tar
drakx-54643229cb7453f41e082a12d1ea927432437b57.tar.gz
drakx-54643229cb7453f41e082a12d1ea927432437b57.tar.bz2
drakx-54643229cb7453f41e082a12d1ea927432437b57.tar.xz
drakx-54643229cb7453f41e082a12d1ea927432437b57.zip
read back xen conf from grub2
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 360f20c0f..b1d48cd65 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -244,9 +244,9 @@ sub read_grub2 {
if (/menuentry\s+['"]([^']+)["']/) {
push @{$bootloader{entries}}, $entry if $entry;
$entry = { label => $1 };
- } elsif (/linux\s+(\S+)\s+(.*)?/) {
+ } elsif (/linux\s+(\S+)\s+(.*)?/ || /module\s+(\S+vmlinu\S+)\s+(.*)?/) {
@$entry{qw(kernel_or_dev append)} = ($1, $2);
- } elsif (/initrd\s+(\S+)/) {
+ } elsif (/initrd\s+(\S+)/ || /module\s+(\S+initrd\S+)\s+(.*)?/) {
$entry->{initrd} = $1;
}
}