From a3e23e03ca118f4e5dcebeeba40d5e54a65264ba Mon Sep 17 00:00:00 2001 From: Frederic Lepied Date: Fri, 28 Feb 2003 08:37:48 +0000 Subject: Configure hostname only in expert mode. --- perl-install/network/ethernet.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 112e74b1c..c7a7d1a92 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -184,16 +184,12 @@ sub configureNetwork { if ($last->{BOOTPROTO} !~ /static/) { $netc->{minus_one} = 1; # $::isInstall and $in->set_help('configureNetworkHostDHCP'); - $in->ask_from(N("Configuring network"), -N("Please enter your host name if you know it. -Some DHCP servers require the hostname to work. -Your host name should be a fully-qualified host name, -such as ``mybox.mylab.myco.com''.") . N(" + $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("Host name"), val => \$netc->{HOSTNAME} }, - { label => N("Zeroconf Host name"), val => \$netc->{ZEROCONF_HOSTNAME} }, + [ { label => N("Zeroconf Host name"), val => \$netc->{ZEROCONF_HOSTNAME} }, + if_($::expert, { label => N("Host name"), val => \$netc->{HOSTNAME} }), ], complete => sub { if ($netc->{ZEROCONF_HOSTNAME} and $netc->{ZEROCONF_HOSTNAME} =~ /\./) { -- cgit v1.2.1