diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-04-04 15:01:35 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-04-04 15:01:35 +0000 |
| commit | dbdda66e1dbce410bc9e35bf1346f681c16bf366 (patch) | |
| tree | a51deea5433829277e29571ef30fa41875c68640 /perl-install/install_steps_interactive.pm | |
| parent | 84c66b2c906ebc4289fb3858b3f0d22121361b38 (diff) | |
| download | drakx-backup-do-not-use-dbdda66e1dbce410bc9e35bf1346f681c16bf366.tar drakx-backup-do-not-use-dbdda66e1dbce410bc9e35bf1346f681c16bf366.tar.gz drakx-backup-do-not-use-dbdda66e1dbce410bc9e35bf1346f681c16bf366.tar.bz2 drakx-backup-do-not-use-dbdda66e1dbce410bc9e35bf1346f681c16bf366.tar.xz drakx-backup-do-not-use-dbdda66e1dbce410bc9e35bf1346f681c16bf366.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index a0b363efd..1a76e2972 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -123,7 +123,7 @@ Hey no kidding, you will be allowed powerfull but dangerous things here."), first(list2kv(@c)), ${{reverse %c}}{$o->{installClass}}, [ __("Install"), __("Upgrade") ], $o->{isUpgrade} ? "Upgrade" : "Install") eq "Upgrade"; - if ($::beginner || $o->{isUpgrade}) { + if ($::corporate || $::beginner || $o->{isUpgrade}) { $o->{installClass} = "normal"; } else { my %c = ( @@ -263,6 +263,10 @@ sub selectPackagesToUpgrade { sub choosePackages { my ($o, $packages, $compss, $compssUsers, $compssUsersSorted, $first_time) = @_; + #- this is done at the very beginning to take into account + #- selection of CD by user. + $o->chooseCD($packages); + require pkgs; unless ($o->{isUpgrade}) { my $available = pkgs::invCorrectSize(install_any::getAvailableSpace($o) / sqr(1024)) * sqr(1024); @@ -277,7 +281,6 @@ sub choosePackages { pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $::expert ? 90 : 80, $available, $o->{installClass}); my $min_size = pkgs::selectedSize($packages); - $o->chooseCD($packages); $o->chooseGroups($packages, $compssUsers, $compssUsersSorted); my $max_size = int (sum map { pkgs::packageSize($_) } values %{$packages->[0]}); @@ -582,8 +585,10 @@ sub servicesConfig { } #------------------------------------------------------------------------------ -sub printerConfig($) { - my ($o) = @_; +sub printerConfig { + my ($o, $clicked) = @_; + + return if $::corporate && $::beginner && !$clicked; require printer; eval { add2hash($o->{printer} ||= {}, printer::getinfo($o->{prefix})) }; @@ -592,7 +597,7 @@ sub printerConfig($) { } #------------------------------------------------------------------------------ -sub setRootPassword($) { +sub setRootPassword { my ($o, $clicked) = @_; my $sup = $o->{superuser} ||= {}; $sup->{password2} ||= $sup->{password} ||= ""; @@ -639,7 +644,7 @@ _("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _(" #------------------------------------------------------------------------------ #-addUser #------------------------------------------------------------------------------ -sub addUser($) { +sub addUser { my ($o, $clicked) = @_; my $u = $o->{user} ||= $o->{security} < 1 ? { name => "mandrake", password => "mandrake", realname => "default" } : {}; $u->{password2} ||= $u->{password} ||= ""; |