diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-09-25 16:22:18 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-09-25 16:22:18 +0000 |
| commit | 07cfbe49efa16539739dbb312ebe81ab2c81b87d (patch) | |
| tree | cbad47b03620d1a267663791f7ef905c61478102 /perl-install/install2.pm | |
| parent | 8e690ad57bb02fe2bd838aa60b80774149971047 (diff) | |
| download | drakx-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar drakx-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar.gz drakx-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar.bz2 drakx-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar.xz drakx-07cfbe49efa16539739dbb312ebe81ab2c81b87d.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 03e0b591b..94b11e9fa 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -252,7 +252,7 @@ sub selectInstallClass { $o->selectPackagesToUpgrade if $o->{isUpgrade}; } if ($o->{isUpgrade}) { - @{$o->{orderedSteps}} = map { /setupSCSI/ ? ($_, "doPartitionDisks") : $_ } + @{$o->{orderedSteps}} = map { /setupSCSI/ ? ($_, "doPartitionDisks") : $_ } grep { !/doPartitionDisks/ } @{$o->{orderedSteps}}; my $s; foreach (@{$o->{orderedSteps}}) { $s->{next} = $_ if $s; @@ -545,11 +545,6 @@ sub main { $o->{prefix} = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt"; $o->{root} = $::testing ? "/tmp/root-perl-install" : "/"; if ($::live) { - @{$o->{orderedSteps}} = grep { /choosePackages/ || /installPackages/ } @{$o->{orderedSteps}}; - my $s; foreach (@{$o->{orderedSteps}}) { - $s->{next} = $_ if $s; - $s = $o->{steps}{$_}; - } $o->{isUpgrade} = 1; #$::beginner = 0; #- use custom by default. } |