summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-01-09 01:25:52 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-01-09 01:47:22 +0100
commit536363ad8f09bbba896f5869c65870f81118fa6c (patch)
treea5ccc1d836973250c435662e80c06de398487f3d
parent7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92 (diff)
downloaddrakx-536363ad8f09bbba896f5869c65870f81118fa6c.tar
drakx-536363ad8f09bbba896f5869c65870f81118fa6c.tar.gz
drakx-536363ad8f09bbba896f5869c65870f81118fa6c.tar.bz2
drakx-536363ad8f09bbba896f5869c65870f81118fa6c.tar.xz
drakx-536363ad8f09bbba896f5869c65870f81118fa6c.zip
fix ignoring options from isolinux
regression introduced in commit 560f9ca983d743cc42701c24546ac8c2080a13fe
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6e8272edd..83678b627 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- regressions from 17.11:
+ o fix ignoring options from isolinux
- silent a perl-5.22 warning
Version 17.12 - 2 January 2016
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 0756e4028..640d9e57c 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -517,7 +517,7 @@ Parse arguments (which came from either the boot loader command line or its conf
sub parse_args {
my ($cfg, $patch);
- my @cmdline = @_, map { "--$_" } split ' ', cat_("/proc/cmdline");
+ my @cmdline = (@_, map { "--$_" } split ' ', cat_("/proc/cmdline"));
#- from stage1
put_in_hash(\%ENV, { getVarsFromSh('/tmp/env') });