diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:33:53 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:33:53 +0000 |
| commit | 54643229cb7453f41e082a12d1ea927432437b57 (patch) | |
| tree | 1ed7d396513dd0c412c3bcc0919738ec7b160b50 | |
| parent | a453417ca7a14444345385b177d1b553286a8bd9 (diff) | |
| download | drakx-54643229cb7453f41e082a12d1ea927432437b57.tar drakx-54643229cb7453f41e082a12d1ea927432437b57.tar.gz drakx-54643229cb7453f41e082a12d1ea927432437b57.tar.bz2 drakx-54643229cb7453f41e082a12d1ea927432437b57.tar.xz drakx-54643229cb7453f41e082a12d1ea927432437b57.zip | |
read back xen conf from grub2
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5c29a2dfc..1bdcee2ee 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- drakboot: + o read back xen conf from grub2 - draksound o update draksound troubleshooting text (mga#4162) 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; } } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d857ad5b1..97b202310 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- drakboot: + o read back xen conf from grub2 - fix finding translated help (mga#9619) Version 15.34 - 4 April 2013 |