From ce50b8a596980b7af41bd83426c94a5058430163 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 20 Jan 2004 12:34:57 +0000 Subject: always go to hostname step (shared by all paths) --- perl-install/network/netconnect.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 569b9d8d2..966cf5d1d 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -593,10 +593,7 @@ notation (for example, 1.2.3.4).")), $in->do_pkgs->install($netcnx->{dhcp_client}) if $auto_ip; #FIXME "wireless" if $ethntf->{wireless_eth}; - # FIXME: only ask for zeroconf if no dynamic host *AND* no adsl/isdn/modem (aka type being lan|wireless) - return is_dynamic_ip($intf) ? - (is_dynamic_host($ethntf) ? "dhcp_hostname" : "zeroconf") - : "static_hostname"; + return "static_hostname"; }, }, -- cgit v1.2.1