From 5088bd44d2469cbcd9e58ee8f6cae74bc9e43cfd Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Tue, 26 Sep 2000 16:11:04 +0000
Subject: set help.

---
 perl-install/help.pm    | 5 ++++-
 perl-install/network.pm | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/help.pm b/perl-install/help.pm
index e6ff5342b..294765557 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -347,7 +347,10 @@ you select the option \"Automatic IP\" below.
   \"IP address\". If you don't know or are not sure if you need to select this option, ask your network administrator."),
 
 configureNetworkHost => __("You may now enter your host name if needed. If you
-don't know or are not sure what to enter, ask yout network administrator."),
+don't know or are not sure what to enter, ask your network administrator."),
+
+configureNetworkHostDHCP => __("You may now enter your host name if needed. If you
+don't know or are not sure what to enter, leave blank."),
 
 configureNetworkISP =>
  __("You may now enter dialup options. If you're not sure what to enter, the
diff --git a/perl-install/network.pm b/perl-install/network.pm
index bfc94ed96..75d29537f 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -267,6 +267,7 @@ sub configureNetwork {
     #-	  }
     if ($last->{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
 	my $dhcp_hostname = $netc->{HOSTNAME};
+	$::isInstall and $in->set_help('configureNetworkHostDHCP');
 	$in->ask_from_entries_ref(_("Configuring network"),
 _("Please enter your host name if you know it.
 Some DHCP servers require the hostname to work.
@@ -328,6 +329,7 @@ sub configureNetworkNet {
     $netc->{dnsServer} ||= dns($intf->{IPADDR});
     $netc->{GATEWAY}   ||= gateway($intf->{IPADDR});
 
+    $::isInstall and $in->set_help('configureNetworkHost');
     $in->ask_from_entries_refH(_("Configuring network"),
 _("Please enter your host name.
 Your host name should be a fully-qualified host name,
@@ -344,7 +346,7 @@ You may also enter the IP address of the gateway if you have one"),
 sub miscellaneousNetwork {
     my ($in, $clicked) = @_;
     my $u = $::o->{miscellaneous} ||= {};
-    $::isStandalone or $in->set_help('configureNetworkProxy');
+    $::isInstall and $in->set_help('configureNetworkProxy');
     !$::beginner || $clicked and $in->ask_from_entries_ref('',
        _("Proxies configuration"),
        [ _("HTTP proxy"),
-- 
cgit v1.2.1