diff options
| -rw-r--r-- | perl-install/network/network.pm | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/drakauth | 2 |
2 files changed, 4 insertions, 3 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 diff --git a/perl-install/standalone/drakauth b/perl-install/standalone/drakauth index e20848a03..c68a75b84 100755 --- a/perl-install/standalone/drakauth +++ b/perl-install/standalone/drakauth @@ -31,7 +31,7 @@ authentication::ask_parameters($in, $netc, $authentication, $kind) or goto main; eval { authentication::set($in, $netc, $authentication); - network::network::write_conf("$::prefix/etc/sysconfig/network", $netc); + network::network::write_conf($netc); }; if (my $err = $@) { $in->ask_warn(N("Error"), formatError($err)); |