diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-12-09 12:21:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-12-09 12:21:58 +0000 |
| commit | 4c7faea852e5414f2323d38baa9339bf6bce52f6 (patch) | |
| tree | d3069068c5f08a60f685459250713818ea18e6e3 | |
| parent | 714a5e1e25a35fcc71656e4f2782d452f6cdbe27 (diff) | |
| download | drakx-backup-do-not-use-4c7faea852e5414f2323d38baa9339bf6bce52f6.tar drakx-backup-do-not-use-4c7faea852e5414f2323d38baa9339bf6bce52f6.tar.gz drakx-backup-do-not-use-4c7faea852e5414f2323d38baa9339bf6bce52f6.tar.bz2 drakx-backup-do-not-use-4c7faea852e5414f2323d38baa9339bf6bce52f6.tar.xz drakx-backup-do-not-use-4c7faea852e5414f2323d38baa9339bf6bce52f6.zip | |
(selectInstallClass): if expert pre-chosen, ensure expert is kept
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index b0b5fbd78..a2faedac9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -184,8 +184,8 @@ sub selectInstallClass1 { } #------------------------------------------------------------------------------ -sub selectInstallClass($@) { - my ($o, @classes) = @_; +sub selectInstallClass { + my ($o, $clicked) = @_; my %c = my @c = ( $::corporate ? () : ( @@ -195,7 +195,8 @@ sub selectInstallClass($@) { _("Customized") => "specific", _("Expert") => "expert", ), - ); + ); + %s = @c = (_("Expert") => "expert") if $::expert && !$clicked; $o->set_help('selectInstallClassCorpo') if $::corporate; @@ -209,7 +210,7 @@ You will be allowed to make powerful but dangerous things here. You will be asked questions such as: ``Use shadow file for passwords?'', are you ready to answer that kind of questions?"), [ _("Customized"), _("Expert") ]) ne "Customized"; - }; + }; $o->{isUpgrade} = $o->selectInstallClass1($verifInstallClass, first(list2kv(@c)), ${{reverse %c}}{$::beginner ? "beginner" : $::expert ? "expert" : "specific"}, @@ -834,7 +835,7 @@ sub addUser { } }, complete => sub { - $u->{password} eq $u->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,3); + $u->{password} eq $u->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,2); $o->{security} > 3 && length($u->{password}) < 6 and $o->ask_warn('', _("This password is too simple")), return (1,2); $u->{name} or $o->ask_warn('', _("Please give a user name")), return (1,0); $u->{name} =~ /^[a-z0-9_-]+$/ or $o->ask_warn('', _("The user name must contain only lower cased letters, numbers, `-' and `_'")), return (1,0); |