diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-09-21 16:54:32 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-09-21 16:54:32 +0000 |
| commit | a57d96056493854fe2a90e1ffcaf5c3ca63248b1 (patch) | |
| tree | 1f0d454c79b2188d033a7c38ba233d4e82defaa5 | |
| parent | 80b73550aa06653abdbeddf84445040629954afd (diff) | |
| download | drakx-a57d96056493854fe2a90e1ffcaf5c3ca63248b1.tar drakx-a57d96056493854fe2a90e1ffcaf5c3ca63248b1.tar.gz drakx-a57d96056493854fe2a90e1ffcaf5c3ca63248b1.tar.bz2 drakx-a57d96056493854fe2a90e1ffcaf5c3ca63248b1.tar.xz drakx-a57d96056493854fe2a90e1ffcaf5c3ca63248b1.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/ChangeLog | 2 | ||||
| -rw-r--r-- | perl-install/network.pm | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 1c20bf887..6f86761b6 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -9,6 +9,8 @@ * printer.pm: changed timeout from 30 to 60. * printerdrake.pm: added wait message when waiting for cups to start. + * pci_probing/pcitable: added erwan VIA Rhine board. + * network.pm: added DHCP_HOSTNAME reference. 2000-09-21 DrakX <install@linux-mandrake.com> diff --git a/perl-install/network.pm b/perl-install/network.pm index ddc601ef7..c7b88e420 100644 --- a/perl-install/network.pm +++ b/perl-install/network.pm @@ -68,10 +68,10 @@ sub write_conf { NETWORKING => "yes", FORWARD_IPV4 => "false", HOSTNAME => "localhost.localdomain", - }); + }); add2hash($netc, { DOMAINNAME => $netc->{HOSTNAME} =~ /\.(.*)/ }); - setVarsInSh($file, $netc, qw(NETWORKING FORWARD_IPV4 HOSTNAME DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN)); + setVarsInSh($file, $netc, qw(NETWORKING FORWARD_IPV4 DHCP_HOSTNAME HOSTNAME DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN)); } sub write_resolv_conf { @@ -263,12 +263,14 @@ sub configureNetwork { #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf}); #- } if ($last->{BOOTPROTO} =~ /^(dhcp|bootp)$/) { + my $dhcp_hostname = $netc->{HOSTNAME}; $in->ask_from_entries_ref(_("Configuring network"), _("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''."), [_("Host name")], [ \$netc->{HOSTNAME} ]); + $netc->{HOSTNAME} ne $dhcp_hostname and $netc->{DHCP_HOSTNAME} = $netc->{HOSTNAME}; } else { configureNetworkNet($in, $netc, $last ||= {}, @l); } |