diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-29 15:44:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-29 15:44:36 +0000 |
| commit | 71f1a980cbc3028a917346cd9d6b120bda66cc75 (patch) | |
| tree | be207cc1b6da4cd65bbb67a2b79c74db22f23868 | |
| parent | 2e9a5f757412d0d81fedb87c45f087907d5291aa (diff) | |
| download | drakx-backup-do-not-use-71f1a980cbc3028a917346cd9d6b120bda66cc75.tar drakx-backup-do-not-use-71f1a980cbc3028a917346cd9d6b120bda66cc75.tar.gz drakx-backup-do-not-use-71f1a980cbc3028a917346cd9d6b120bda66cc75.tar.bz2 drakx-backup-do-not-use-71f1a980cbc3028a917346cd9d6b120bda66cc75.tar.xz drakx-backup-do-not-use-71f1a980cbc3028a917346cd9d6b120bda66cc75.zip | |
fix DHCP client installation
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 624be843a..1980f0aad 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -811,7 +811,7 @@ Modifying the fields below will override this configuration."), delete $ethntf->{NETWORK}; delete $ethntf->{BROADCAST}; @fields = qw(IPADDR NETMASK); - $netcnx->{dhcp_client} ||= "dhcp-client"; + $netc->{dhcp_client} ||= "dhcp-client"; }, name => sub { join('', N("Configuring network device %s (driver %s)", $ethntf->{DEVICE}, $module), @@ -833,7 +833,7 @@ notation (for example, 1.2.3.4).")), { text => N("Track network card id (useful for laptops)"), val => \$track_network_id, type => "bool" }, { text => N("Network Hotplugging"), val => \$hotplug, type => "bool" }, { text => N("Start at boot"), val => \$onboot, type => "bool" }, - { label => N("DHCP client"), val => \$netcnx->{dhcp_client}, + { label => N("DHCP client"), val => \$netc->{dhcp_client}, list => ["dhcp-client", "dhcpcd", "dhcpxd"], advanced => 1 }, ], }, @@ -855,7 +855,7 @@ notation (for example, 1.2.3.4).")), $ethntf->{NEEDHOSTNAME} = bool2yesno($needhostname); $ethntf->{MII_NOT_SUPPORTED} = bool2yesno(!$hotplug); $ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR}; - $in->do_pkgs->install($netcnx->{dhcp_client}) if $auto_ip; + $in->do_pkgs->install($netc->{dhcp_client}) if $auto_ip; write_cnx_script($netc, "cable", qq( /sbin/ifup $netc->{NET_DEVICE} ), |