summaryrefslogtreecommitdiffstats
path: root/perl-install/network/network.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-09 16:44:43 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-09 16:44:43 +0000
commitce971f65c6ba5901b3ec57da501b45b78fab256d (patch)
tree1d8d8527283b6017094bbe069822e6b62c5dd54b /perl-install/network/network.pm
parente4b00449f014c0e2000e360114634a24bde6899d (diff)
downloaddrakx-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar
drakx-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar.gz
drakx-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar.bz2
drakx-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar.xz
drakx-ce971f65c6ba5901b3ec57da501b45b78fab256d.zip
write selected dhcp client in ifcfg files
Diffstat (limited to 'perl-install/network/network.pm')
-rw-r--r--perl-install/network/network.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 1de40d996..4feb2061c 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -164,7 +164,7 @@ sub write_interface_conf {
setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL),
qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV),
- if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_HOSTNAME NEEDHOSTNAME PEERDNS PEERYP PEERNTPD DHCP_TIMEOUT)),
+ if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_CLIENT DHCP_HOSTNAME NEEDHOSTNAME PEERDNS PEERYP PEERNTPD DHCP_TIMEOUT)),
if_($intf->{DEVICE} =~ /^ippp\d+$/, qw(DIAL_ON_IFUP))
);
substInFile { s/^DEVICE='(`.*`)'/DEVICE=$1/g } $file; #- remove quotes if DEVICE is the result of a command
@@ -650,11 +650,11 @@ sub configureNetwork2 {
foreach (grep { !/^ppp\d+/ } keys %$intf) {
unlink("$etc/sysconfig/network-scripts/$_");
write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_", $intf->{$_}, $netc, $::prefix);
+ $intf->{$_}{BOOTPROTO} eq "dhcp" and network::ethernet::install_dhcp_client($in, $intf->{$_});
}
add2hosts("$etc/hosts", $netc->{HOSTNAME}, "127.0.0.1") if $netc->{HOSTNAME};
add2hosts("$etc/hosts", "localhost", "127.0.0.1");
- any { $_->{BOOTPROTO} eq "dhcp" } values %$intf and $in->do_pkgs->install($netc->{dhcp_client} || 'dhcp-client');
if ($netc->{ZEROCONF_HOSTNAME}) {
$in->do_pkgs->ensure_binary_is_installed('tmdns', 'tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
$in->do_pkgs->ensure_binary_is_installed('zcip', 'zcip', 'auto');