diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 12:34:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 12:34:57 +0000 |
| commit | ce50b8a596980b7af41bd83426c94a5058430163 (patch) | |
| tree | a41448d79566dfe32fe67a244058b0df0fdda8fa | |
| parent | 3d2275e354c6b7301aa35c3b5af427b67e9fc586 (diff) | |
| download | drakx-ce50b8a596980b7af41bd83426c94a5058430163.tar drakx-ce50b8a596980b7af41bd83426c94a5058430163.tar.gz drakx-ce50b8a596980b7af41bd83426c94a5058430163.tar.bz2 drakx-ce50b8a596980b7af41bd83426c94a5058430163.tar.xz drakx-ce50b8a596980b7af41bd83426c94a5058430163.zip | |
always go to hostname step (shared by all paths)
| -rw-r--r-- | perl-install/network/netconnect.pm | 5 |
1 files changed, 1 insertions, 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"; }, }, |