From e2841184510393c68f08f937f37c028288f1a754 Mon Sep 17 00:00:00 2001 From: Damien Chaumette Date: Thu, 12 Jun 2003 16:02:40 +0000 Subject: - drop $::Expert - drop $netc->{ZEROCONF_HOSTNAME}, only need regexp --- perl-install/network/ethernet.pm | 8 ++++---- 1 file 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; } -- cgit v1.2.1