summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-11 09:01:50 +0000
committerdamien <damien@mandriva.com>2000-09-11 09:01:50 +0000
commitf5d31de24627657212675867a36831d208148043 (patch)
tree76429a9ccb86593b284b1f0c5161ebc52049f5d6
parent1edbec3e32c159de3430bf839d03799239beecf8 (diff)
downloaddrakx-backup-do-not-use-f5d31de24627657212675867a36831d208148043.tar
drakx-backup-do-not-use-f5d31de24627657212675867a36831d208148043.tar.gz
drakx-backup-do-not-use-f5d31de24627657212675867a36831d208148043.tar.bz2
drakx-backup-do-not-use-f5d31de24627657212675867a36831d208148043.tar.xz
drakx-backup-do-not-use-f5d31de24627657212675867a36831d208148043.zip
updated
-rw-r--r--perl-install/network.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network.pm b/perl-install/network.pm
index c9eaaf9ba..2bf55a448 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -318,9 +318,9 @@ sub configureNetwork2 {
sethostname($netc) unless $::testing;
addDefaultRoute($netc) unless $::testing;
- $in->pkg_install("dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$intf};
+ grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$intf} and $::isStandalone ? system("urpmi --auto dhcpd") : $in->pkg_install("dhcpcd");
# Handle also pump (this is still in initscripts no?)
- $in->pkg_install("pump") if grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$intf};
+ grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$intf} and $::isStandalone ? system("urpmi --auto pump") : $in->pkg_install("pump");
#-res_init(); #- reinit the resolver so DNS changes take affect
any::miscellaneousNetwork($in, $prefix);