summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-30 13:20:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-30 13:20:49 +0000
commite5cf73a6e470b0b0503c51f87d40e62a62fa1ba1 (patch)
treed06a23ec0d49f64dc98fdaeba8efe60c1fa9a1f2 /perl-install/network
parent9d8747c64199e305b47b71279ea5b7f18b5479ab (diff)
downloaddrakx-e5cf73a6e470b0b0503c51f87d40e62a62fa1ba1.tar
drakx-e5cf73a6e470b0b0503c51f87d40e62a62fa1ba1.tar.gz
drakx-e5cf73a6e470b0b0503c51f87d40e62a62fa1ba1.tar.bz2
drakx-e5cf73a6e470b0b0503c51f87d40e62a62fa1ba1.tar.xz
drakx-e5cf73a6e470b0b0503c51f87d40e62a62fa1ba1.zip
don't pass the prefix/etc/sysconfig/network to network::network::write_conf(), we always use the same file name
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/network.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 3a99c2f96..febaa632d 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -78,7 +78,8 @@ sub read_tmdns_conf() {
}
sub write_conf {
- my ($file, $netc) = @_;
+ my ($netc) = @_;
+ my $file = "$::prefix/etc/sysconfig/network";
if ($netc->{HOSTNAME} && $netc->{HOSTNAME} =~ /\.(.+)$/) {
$netc->{DOMAINNAME} = $1;
@@ -437,7 +438,7 @@ sub configureNetwork2 {
network::ethernet::configure_eth_aliases($modules_conf);
$netc->{wireless_eth} and $in->do_pkgs->ensure_binary_is_installed('wireless-tools', 'iwconfig', 'auto');
- write_conf("$etc/sysconfig/network", $netc);
+ write_conf($netc);
write_resolv_conf("$etc/resolv.conf", $netc) unless $netc->{DHCP};
if ($::isInstall && ! -e "/etc/resolv.conf") {
#- symlink resolv.conf in install root too so that updates and suppl media can be added