summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-09-18 15:04:52 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-09-18 15:23:31 +0200
commit1941fa3c6e9a68a1004c92f42493508bb46a32b5 (patch)
tree91a1e957ea0d2033ddc491158007d5cd65a2210a /perl-install
parent56c8070207a8395b7fb0c20eb200fd9bd8c76757 (diff)
downloaddrakx-1941fa3c6e9a68a1004c92f42493508bb46a32b5.tar
drakx-1941fa3c6e9a68a1004c92f42493508bb46a32b5.tar.gz
drakx-1941fa3c6e9a68a1004c92f42493508bb46a32b5.tar.bz2
drakx-1941fa3c6e9a68a1004c92f42493508bb46a32b5.tar.xz
drakx-1941fa3c6e9a68a1004c92f42493508bb46a32b5.zip
read_grub2: fix undefined labels (mga#19014)
we were wrongly assuming we entered a new entry when reading eg: "${xen_rm_opts}" (which is why most people never see that error and why I wasn't able to reproduce it, one would need Xen or similar to be installed) Then drakboot would crash with: drakboot crashed ("undefined value for mandatory argument 'text' encountered at ugtk3.pm" Theorically, it could happen with DrakX too when updating a system with Xen.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 209285c49..8033095ed 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- drakboot:
o better read back config
+ o fix undefined labels when eg: Xen is installed (mga#19014)
+ drakboot crashed with "undefined value for mandatory argument 'text''
Version 17.88 - 7 July 2017
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index cf3dfbc18..1e629345e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -329,7 +329,7 @@ sub read_grub2() {
$entry->{initrd} = $1;
} elsif (/^submenu\s+['"]([^']+)["']/) {
push @menus, $1;
- } elsif (/}/) {
+ } elsif (/^\s+}/) {
if ($entry) {
push @{$bootloader{entries}}, $entry;
undef $entry;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4c130f5be..b14376a3d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- bootloader:
o better read back config
+ o fix undefined labels when eg: Xen is installed (mga#19014)
+ crash with "undefined value for mandatory argument 'text''
Version 17.89 - 7 September 2017