summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-11-07 17:38:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-11-07 17:38:01 +0000
commit246b337f95f3e0edc21d31b4b6a1d826d0a120cc (patch)
tree22a8656238d8f9d484e2df4241f36c3c192322bb
parentf24720f5798d7bd84bc7d39967fa52fcd6802df0 (diff)
downloaddrakx-backup-do-not-use-246b337f95f3e0edc21d31b4b6a1d826d0a120cc.tar
drakx-backup-do-not-use-246b337f95f3e0edc21d31b4b6a1d826d0a120cc.tar.gz
drakx-backup-do-not-use-246b337f95f3e0edc21d31b4b6a1d826d0a120cc.tar.bz2
drakx-backup-do-not-use-246b337f95f3e0edc21d31b4b6a1d826d0a120cc.tar.xz
drakx-backup-do-not-use-246b337f95f3e0edc21d31b4b6a1d826d0a120cc.zip
(main): $::oem is now global :-( (needed in install_steps.pm)
-rw-r--r--perl-install/install2.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index f1e3e4d62..bb9f55bbc 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -455,7 +455,7 @@ sub main {
#- c::unlimit_core() unless $::testing;
- my ($cfg, $patch, $oem, @auto);
+ my ($cfg, $patch, @auto);
my %cmdline; map {
my ($n, $v) = split '=';
$cmdline{$n} = $v || 1;
@@ -476,7 +476,7 @@ sub main {
map_each {
my ($n, $v) = @_;
my $f = ${{
- oem => sub { $oem = $v },
+ oem => sub { $::oem = $v },
lang => sub { $o->{lang} = $v },
flang => sub { $o->{lang} = $v ; push @auto, 'selectLanguage' },
method => sub { $o->{method} = $v },
@@ -603,7 +603,7 @@ sub main {
if ($o->{meta_class} eq 'desktop') {
$o->{installClass} = 'normal';
}
- if ($oem) {
+ if ($::oem) {
$o->{partitioning}{use_existing_root} = 1;
$o->{partitioning}{auto_allocate} = 1;
$o->{compssListLevel} = 50;