diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-09-18 15:04:52 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-09-18 15:24:38 +0200 |
| commit | 963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b (patch) | |
| tree | e3eef5f819bb8ec18d61ba48e06b4b2dfff83aae | |
| parent | 874d3b2979d74e2115991c586bda66aa0a70519d (diff) | |
| download | drakx-963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b.tar drakx-963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b.tar.gz drakx-963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b.tar.bz2 drakx-963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b.tar.xz drakx-963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b.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.
(cherry picked from commit 1941fa3c6e9a68a1004c92f42493508bb46a32b5)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
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 a13e2cdcd..4fc2bf242 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.88 - 7 July 2017 |