summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-17 00:39:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-17 00:39:01 +0000
commit11b0b944ddde76b4982fa2f9e2118dcee5035f80 (patch)
treea873f848dcf1eda96b89a0319f8923e10bbc5b4a /perl-install/install2.pm
parentd77799bb5ce63ecac4de72e1b27f56d7d22fd048 (diff)
downloaddrakx-backup-do-not-use-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar
drakx-backup-do-not-use-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar.gz
drakx-backup-do-not-use-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar.bz2
drakx-backup-do-not-use-11b0b944ddde76b4982fa2f9e2118dcee5035f80.tar.xz
drakx-backup-do-not-use-11b0b944ddde76b4982fa2f9e2118dcee5035f80.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 737a0b2db..41824979c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -159,7 +159,6 @@ $o = $::o = {
#- { mntpoint => "swap", size => 64 << 11, type => 0x82 },
#- { mntpoint => "/usr", size => 400 << 11, type => 0x83, growable => 1 },
#- ],
- shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ],
authentication => { md5 => 1, shadow => 1 },
lang => 'en_US',
isUpgrade => 0,
@@ -281,7 +280,7 @@ sub selectInstallClass {
if ($o->{steps}{choosePackages}{entered} >= 1 && !$o->{steps}{installPackages}{done}) {
$o->setPackages(\@install_classes);
- $o->selectPackagesToUpgrade() if $o->{isUpgrade};
+ $o->selectPackagesToUpgrade if $o->{isUpgrade};
}
if ($o->{isUpgrade}) {
@{$o->{orderedSteps}} = map { /setupSCSI/ ? ($_, "doPartitionDisks") : $_ }
@@ -295,7 +294,7 @@ sub selectInstallClass {
#------------------------------------------------------------------------------
sub doPartitionDisks {
- return install_any::searchAndMount4Upgrade($o) if $o->{isUpgrade};
+ return $o->searchAndMount4Upgrade if $o->{isUpgrade};
$o->{steps}{formatPartitions}{done} = 0;
$o->doPartitionDisksBefore;
@@ -340,7 +339,7 @@ sub choosePackages {
#- for the first time, select package to upgrade.
#- TOCHECK this may not be the best place for that as package are selected at some other point.
if ($_[1] == 1) {
- $o->selectPackagesToUpgrade($o) if $o->{isUpgrade};
+ $o->selectPackagesToUpgrade if $o->{isUpgrade};
$o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous';
# $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better