From 2b91f12129cd682fcd91d2556a8a68987ee466db Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 26 Sep 2007 15:09:09 +0000
Subject: - handle @::auto_steps in patch-oem.pl

---
 perl-install/install/NEWS        | 1 +
 perl-install/install/install2.pm | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e831cafea..d9b65d19f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
 - fix using iso CD2 on disk (#33022):
   o remove " from medium name when reading media.cfg
   o handle "Volume id" ending with -CD[123] instead of -Disc[123]
+- handle @::auto_steps in patch-oem.pl
 
 Version 10.4.214 - 26 September 2007, by Thierry Vignaud
 
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 223c46adb..eb303e4c7 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -317,7 +317,7 @@ sub main {
 
     push @::textdomains, 'DrakX', 'drakx-net', 'drakx-kbd-mouse-x11';
 
-    my ($cfg, $patch, @auto);
+    my ($cfg, $patch);
     my %cmdline = map { 
 	my ($n, $v) = split /=/;
 	$n => defined($v) ? $v : 1;
@@ -341,7 +341,7 @@ sub main {
 	my ($n, $v) = @_;
 	my $f = ${{
 	    lang      => sub { $o->{locale}{lang} = $v },
-	    flang     => sub { $o->{locale}{lang} = $v; push @auto, 'selectLanguage' },
+	    flang     => sub { $o->{locale}{lang} = $v; push @::auto_steps, 'selectLanguage' },
 	    langs     => sub { $o->{locale}{langs} = +{ map { $_ => 1 } split(':', $v) } },
 	    method    => sub { $o->{method} = $v },
 	    pcmcia    => sub { $o->{pcmcia} = $v },
@@ -401,7 +401,7 @@ sub main {
     eval { touch('/root/non-chrooted-marker.DrakX') }; #- helps distinguishing /root and /mnt/root when we don't know if we are chrooted
 
     if ($::local_install) {
-	push @auto, 
+	push @::auto_steps, 
 #	  'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
 	  'doPartitionDisks', 'formatPartitions';
 	fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
@@ -553,7 +553,7 @@ sub main {
     log::l("META_CLASS=$o->{meta_class}");
     $ENV{META_CLASS} = $o->{meta_class}; #- for Ia Ora
 
-    foreach (@auto) {
+    foreach (@::auto_steps) {
 	my $s = $o->{steps}{/::(.*)/ ? $1 : $_} or next;
 	$s->{auto} = $s->{hidden} = 1;
     }
-- 
cgit v1.2.1