summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-01 23:02:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-01 23:02:02 +0000
commite3093b811019cc0467f38b744e12ec6871a8d17e (patch)
treecefa6f3f2bb0bf7bf5847ac4870fd8d0a2133e35 /perl-install/install_steps_interactive.pm
parenta613dd1d2271b7733fb05c14ac52964f719f9fa6 (diff)
downloaddrakx-e3093b811019cc0467f38b744e12ec6871a8d17e.tar
drakx-e3093b811019cc0467f38b744e12ec6871a8d17e.tar.gz
drakx-e3093b811019cc0467f38b744e12ec6871a8d17e.tar.bz2
drakx-e3093b811019cc0467f38b744e12ec6871a8d17e.tar.xz
drakx-e3093b811019cc0467f38b744e12ec6871a8d17e.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm21
1 files changed, 12 insertions, 9 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8092c43c0..def291362 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -105,11 +105,15 @@ sub selectInstallClass1 {
sub selectInstallClass($@) {
my ($o, @classes) = @_;
my %c = my @c = (
+ $::corporate ? () : (
_("Recommended") => "beginner",
+ ),
_("Customized") => "specific",
_("Expert") => "expert",
);
+ $o->set_help('selectInstallClassCorpo') if $::corporate;
+
my $verifInstallClass = sub {
$::beginner = $c{$_[0]} eq "beginner";
$::expert = $c{$_[0]} eq "expert" &&
@@ -618,6 +622,7 @@ sub printerConfig {
sub setRootPassword {
my ($o, $clicked) = @_;
my $sup = $o->{superuser} ||= {};
+ my $nis = $o->{authentication}{NIS};
$sup->{password2} ||= $sup->{password} ||= "";
return if $o->{security} < 1 && !$clicked;
@@ -634,7 +639,7 @@ _("Password (again)") => { val => \$sup->{password2}, hidden => 1 },
_("Use shadow file") => { val => \$o->{authentication}{shadow}, type => 'bool', text => _("shadow") },
_("Use MD5 passwords") => { val => \$o->{authentication}{md5}, type => 'bool', text => _("MD5") },
) : (), $::beginner ? () : (
-_("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("yellow pages") },
+_("Use NIS") => { val => \$nis, type => 'bool', text => _("yellow pages") },
)
],
complete => sub {
@@ -645,14 +650,12 @@ _("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("
}
) or return;
- if ($o->{authentication}{NIS}) {
- $o->ask_from_entries_ref('',
- _("Authentification NIS"),
- [ _("NIS Domain"), _("NIS Server") ],
- [ \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}),
- { val => \$o->{authentication}{NIS_server}, list => ["broadcast"] },
- ]);
- }
+ $o->ask_from_entries_ref('',
+ _("Authentification NIS"),
+ [ _("NIS Domain"), _("NIS Server") ],
+ [ \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}),
+ { val => \$o->{authentication}{NIS}, list => ["broadcast"] },
+ ]) if $nis;
install_steps::setRootPassword($o);
}