From ae98b37489fe09b65b20fdf0cb7a85023738f1be Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 9 Jan 2016 01:31:35 +0100
Subject: fix parsing stage1's automatic option (mga#17441)

regression introduced in commit 560f9ca983d743cc42701c24546ac8c2080a13fe
---
 perl-install/install/NEWS        | 1 +
 perl-install/install/install2.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 83678b627..3d2e66698 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - regressions from 17.11:
   o fix ignoring options from isolinux
+  o fix parsing stage1's automatic option (mga#17441)
 - 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 640d9e57c..53de2f139 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -521,7 +521,7 @@ sub parse_args {
 
     #- from stage1
     put_in_hash(\%ENV, { getVarsFromSh('/tmp/env') });
-    exists $ENV{$_} and $cmdline{lc($_)} = $ENV{$_} foreach qw(METHOD PCMCIA KICKSTART);
+    exists $ENV{$_} and push @cmdline, sprintf("--%s=%s", lc($_), $ENV{$_}) foreach qw(METHOD PCMCIA KICKSTART);
 
     GetOptionsFromArray(\@cmdline,
 	    'keyboard=s'   => sub { $o->{keyboard} = $_[1]; push @::auto_steps, 'selectKeyboard' },
-- 
cgit v1.2.1