summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-08-21 16:43:46 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-08-21 16:43:46 +0200
commit6b4eb8a46f56195daaefe12f6b623019db0fb782 (patch)
tree073824cbdacd912ed11053ad94fad451b084373f
parent593f1350594ddf3ca0efe65b7af333a0fc293c64 (diff)
downloaddrakx-6b4eb8a46f56195daaefe12f6b623019db0fb782.tar
drakx-6b4eb8a46f56195daaefe12f6b623019db0fb782.tar.gz
drakx-6b4eb8a46f56195daaefe12f6b623019db0fb782.tar.bz2
drakx-6b4eb8a46f56195daaefe12f6b623019db0fb782.tar.xz
drakx-6b4eb8a46f56195daaefe12f6b623019db0fb782.zip
Keep timeout value when it's 0 (mga#27158)
Rationale: setVarsInSh() excludes lines where value is 0, undefined or empty string
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS3
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2e56b5bc8..57e0cf32d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o keep timeout value when it's 0 (mga#27158)
+
Version 18.33 - 19 August 2020
- fix failure to update grub2 config when service_harddrake attempts to
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 8cd392b0e..c09b12330 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2071,7 +2071,8 @@ sub write_grub2_sysconfig {
$conf{GRUB_DISABLE_RECOVERY} = 'false'; # for 'failsafe' entry
$conf{GRUB_DEFAULT} //= 'saved'; # for default entry but do not overwrite user choice
$conf{GRUB_SAVEDEFAULT} //= 'true'; # for default entry but do not overwrite user choice
- $conf{GRUB_TIMEOUT} = $bootloader->{timeout};
+ # special case so that setVarsInSh() doesn't emit the line when timeout is 0
+ $conf{GRUB_TIMEOUT} = $bootloader->{timeout} eq 0 ? "0 " : $bootloader->{timeout};
renamef($f, $f . ($o_backup_extension || '.old'));
setVarsInSh($f, \%conf);
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0f61e945d..1524bf806 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader:
+ o keep timeout value when it's 0 (mga#27158)
+
Version 18.33 - 19 August 2020
- recognize new kernel 5.5 - 5.8 drivers