diff options
| author | Damien Chaumette <dchaumette@mandriva.com> | 2003-06-12 16:02:40 +0000 |
|---|---|---|
| committer | Damien Chaumette <dchaumette@mandriva.com> | 2003-06-12 16:02:40 +0000 |
| commit | e2841184510393c68f08f937f37c028288f1a754 (patch) | |
| tree | 78010f5f6fbd2cd4b73a0eac7b2d237a795f0314 | |
| parent | e21ebc3bf3bf457d78c3de5e9f0407331c5b4623 (diff) | |
| download | drakx-backup-do-not-use-e2841184510393c68f08f937f37c028288f1a754.tar drakx-backup-do-not-use-e2841184510393c68f08f937f37c028288f1a754.tar.gz drakx-backup-do-not-use-e2841184510393c68f08f937f37c028288f1a754.tar.bz2 drakx-backup-do-not-use-e2841184510393c68f08f937f37c028288f1a754.tar.xz drakx-backup-do-not-use-e2841184510393c68f08f937f37c028288f1a754.zip | |
- drop $::Expert
- drop $netc->{ZEROCONF_HOSTNAME}, only need regexp
| -rw-r--r-- | perl-install/network/ethernet.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index b809639d8..72c512d50 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -173,22 +173,22 @@ sub configureNetwork { if ($last->{BOOTPROTO} !~ /static/) { $netc->{minus_one} = 1; -# $::isInstall and $in->set_help('configureNetworkHostDHCP'); + $in->ask_from(N("Configuring network"), N(" Enter a Zeroconf host name without any dot if you don't want to use the default host name."), [ { label => N("Zeroconf Host name"), val => \$netc->{ZEROCONF_HOSTNAME} }, - if_($::expert, { label => N("Host name"), val => \$netc->{HOSTNAME} }), + { label => N("Host name"), val => \$netc->{HOSTNAME}, advanced => 1 } ], complete => sub { - if ($netc->{ZEROCONF_HOSTNAME} && $netc->{ZEROCONF_HOSTNAME} =~ /\./) { + if ($netc->{ZEROCONF_HOSTNAME} =~ /\./) { $in->ask_warn('', N("Zeroconf host name must not contain a .")); return 1; } 0; } - ) or goto configureNetwork_step_1; + ) or goto configureNetwork_step_1; } else { configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1; } |