diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-01 04:29:13 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-01 04:29:13 +0000 |
| commit | b6f86d13b5e938353fd4f230f7a25187509a1abb (patch) | |
| tree | 18b234b19e8e4a108657c7b3afab287612206b50 | |
| parent | 7c95efc21d7ba8c0f973fcd7320cdda3a9ddb724 (diff) | |
| download | drakx-b6f86d13b5e938353fd4f230f7a25187509a1abb.tar drakx-b6f86d13b5e938353fd4f230f7a25187509a1abb.tar.gz drakx-b6f86d13b5e938353fd4f230f7a25187509a1abb.tar.bz2 drakx-b6f86d13b5e938353fd4f230f7a25187509a1abb.tar.xz drakx-b6f86d13b5e938353fd4f230f7a25187509a1abb.zip | |
write /etc/resolv.conf in install root
| -rw-r--r-- | perl-install/network/network.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 2b07a95b9..748b31055 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -422,7 +422,11 @@ sub configureNetwork2 { if (!$::testing) { $netc->{wireless_eth} and $in->do_pkgs->ensure_binary_is_installed('wireless-tools', 'iwconfig', 'auto'); write_conf("$etc/sysconfig/network", $netc); - write_resolv_conf("$etc/resolv.conf", $netc) if ! $netc->{DHCP}; + unless ($netc->{DHCP}) { + write_resolv_conf("$etc/resolv.conf", $netc); + #- write in install root too so that updates and suppl media can be added + write_resolv_conf("/etc/resolv.conf", $netc) if $::isInstall; + } write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $netc, $::prefix) foreach grep { $_->{DEVICE} ne 'ppp0' } values %$intf; add2hosts("$etc/hosts", $netc->{HOSTNAME}, "127.0.0.1") if $netc->{HOSTNAME}; add2hosts("$etc/hosts", "localhost", "127.0.0.1"); |