summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-09-18 15:04:02 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-09-18 15:24:25 +0200
commit874d3b2979d74e2115991c586bda66aa0a70519d (patch)
tree9c54d0da70a17ebce1d5993b7c9088cb6ea54b10 /perl-install
parent26640d1ed208e83347a334fe8468957729ae13a4 (diff)
downloaddrakx-874d3b2979d74e2115991c586bda66aa0a70519d.tar
drakx-874d3b2979d74e2115991c586bda66aa0a70519d.tar.gz
drakx-874d3b2979d74e2115991c586bda66aa0a70519d.tar.bz2
drakx-874d3b2979d74e2115991c586bda66aa0a70519d.tar.xz
drakx-874d3b2979d74e2115991c586bda66aa0a70519d.zip
(read_grub2) handle both linux & linux16
thus we got more data (cherry picked from commit 56c8070207a8395b7fb0c20eb200fd9bd8c76757)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 32157db23..209285c49 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o better read back config
+
Version 17.88 - 7 July 2017
- translation updates
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6f9ff4eec..cf3dfbc18 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -317,7 +317,7 @@ sub read_grub2() {
next if /^#/;
if (/menuentry\s+['"]([^']+)["']/) {
$entry = { label => $1, real_label => join('>', @menus, $1) };
- } elsif (/linux\s+(\S+)\s+(.*)?/ || /module\s+(\S+vmlinu\S+)\s+(.*)?/) {
+ } elsif (/linux(?:16)?\s+([^-]\S+)\s+(.*)?/ || /module\s+(\S+vmlinu\S+)\s+(.*)?/) {
$entry->{type} = 'image';
@$entry{qw(kernel_or_dev append)} = ($1, $2);
my ($vga, $other) = partition { /^vga=/ } split(' ', $entry->{append});
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 835ec84ef..a13e2cdcd 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader:
+ o better read back config
+
Version 17.88 - 7 July 2017
- translation updates