diff options
| author | Frederic Lepied <flepied@mandriva.com> | 2003-02-28 08:37:48 +0000 |
|---|---|---|
| committer | Frederic Lepied <flepied@mandriva.com> | 2003-02-28 08:37:48 +0000 |
| commit | a3e23e03ca118f4e5dcebeeba40d5e54a65264ba (patch) | |
| tree | 995e3c3cb4bf7ba33973aeb5b9fde8ef664a6308 | |
| parent | 65a233d0370511236e8879136caaa2cd4d307c1e (diff) | |
| download | drakx-backup-do-not-use-a3e23e03ca118f4e5dcebeeba40d5e54a65264ba.tar drakx-backup-do-not-use-a3e23e03ca118f4e5dcebeeba40d5e54a65264ba.tar.gz drakx-backup-do-not-use-a3e23e03ca118f4e5dcebeeba40d5e54a65264ba.tar.bz2 drakx-backup-do-not-use-a3e23e03ca118f4e5dcebeeba40d5e54a65264ba.tar.xz drakx-backup-do-not-use-a3e23e03ca118f4e5dcebeeba40d5e54a65264ba.zip | |
Configure hostname only in expert mode.
| -rw-r--r-- | perl-install/network/ethernet.pm | 10 |
1 files 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} =~ /\./) { |