summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-06 23:29:13 +0000
committerdamien <damien@mandriva.com>2000-09-06 23:29:13 +0000
commitf20ec1f06889a670b873f1480b658868e485cdf9 (patch)
tree82f3caedc1277b373113e3621861e8ebe9152ca6
parent47f1853e14160ded371a5025d5f1070919737689 (diff)
downloaddrakx-f20ec1f06889a670b873f1480b658868e485cdf9.tar
drakx-f20ec1f06889a670b873f1480b658868e485cdf9.tar.gz
drakx-f20ec1f06889a670b873f1480b658868e485cdf9.tar.bz2
drakx-f20ec1f06889a670b873f1480b658868e485cdf9.tar.xz
drakx-f20ec1f06889a670b873f1480b658868e485cdf9.zip
updated
-rw-r--r--perl-install/network.pm36
1 files changed, 18 insertions, 18 deletions
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 51d094e46..323861a41 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -306,24 +306,24 @@ You may also enter the IP address of the gateway if you have one"),
}
-sub configureNetwork2 {
- my ($in, $prefix, $netc, $intf) = @_;
- my $etc = "$prefix/etc";
-
- write_conf("$etc/sysconfig/network", $netc);
- write_resolv_conf("$etc/resolv.conf", $netc);
- write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_) foreach @{$intf};
- add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } @{$intf});
- sethostname($netc) unless $::testing;
- addDefaultRoute($netc) unless $::testing;
-
- $in->pkg_install("dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$intf};
- # Handle also pump (this is still in initscripts no?)
- $in->pkg_install("pump") if grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$intf};
- #-res_init(); #- reinit the resolver so DNS changes take affect
-
- any::miscellaneousNetwork($in, $prefix);
-}
+ sub configureNetwork2 {
+ my ($in, $prefix, $netc, $intf) = @_;
+ my $etc = "$prefix/etc";
+
+ write_conf("$etc/sysconfig/network", $netc);
+ write_resolv_conf("$etc/resolv.conf", $netc);
+ write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_) foreach @{$intf};
+ add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } @{$intf});
+ sethostname($netc) unless $::testing;
+ addDefaultRoute($netc) unless $::testing;
+
+ $in->pkg_install("dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$intf};
+ # Handle also pump (this is still in initscripts no?)
+ $in->pkg_install("pump") if grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$intf};
+ #-res_init(); #- reinit the resolver so DNS changes take affect
+
+ any::miscellaneousNetwork($in, $prefix);
+ }
sub configureNetworkIntf {