diff options
| author | damien <damien@mandriva.com> | 2001-03-12 13:11:52 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-03-12 13:11:52 +0000 |
| commit | 22b13a20f3015b8b679d86cc802dd70ad349aff1 (patch) | |
| tree | eaf6091314f55221c16d566cfc2bdeb595fe5c1f | |
| parent | 782d332e562289ebeb320b1993e78de62c153a4e (diff) | |
| download | drakx-22b13a20f3015b8b679d86cc802dd70ad349aff1.tar drakx-22b13a20f3015b8b679d86cc802dd70ad349aff1.tar.gz drakx-22b13a20f3015b8b679d86cc802dd70ad349aff1.tar.bz2 drakx-22b13a20f3015b8b679d86cc802dd70ad349aff1.tar.xz drakx-22b13a20f3015b8b679d86cc802dd70ad349aff1.zip | |
added $::isInstall
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 2de4eceef..104ed2542 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -803,9 +803,9 @@ sub setRootPassword { return if $o->{security} < 1 && !$clicked; - $o->set_help("setRootPassword", - if_($::expert, "setRootPasswordMd5"), - if_($::expert, "setRootPasswordNIS")); + $::isInstall and $o->set_help("setRootPassword", + if_($::expert, "setRootPasswordMd5"), + if_($::expert, "setRootPasswordNIS")); $o->ask_from_entries_refH_powered( { @@ -826,12 +826,11 @@ sub setRootPassword { ), ]) or return; - $o->{authentication}{NIS} &&= $nis; - $o->ask_from_entries_refH('', - _("Authentification NIS"), - [ { label => _("NIS Domain"), val => \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}) }, - { label => _("NIS Server"), val => \$o->{authentication}{NIS}, list => ["broadcast"], not_edit => 0 }, - ]) if $nis; + if ($nis) { $o->ask_from_entries_refH('', + _("Authentification NIS"), + [ { label => _("NIS Domain"), val => \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}) }, + { label => _("NIS Server"), val => \$o->{authentication}{NIS}, list => ["broadcast"], not_edit => 0 }, + ]); } else { $o->{authentication}{NIS} = ''; } install_steps::setRootPassword($o); } |