diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-04 16:31:14 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-04 16:31:14 +0000 |
| commit | 63fc21d78e0699144ad0b7da8df6212a4609c233 (patch) | |
| tree | 205cf709c95007033179089719bc3373dff3279a | |
| parent | 78bac00ada911a0883bf1e8327f83fc58e200f22 (diff) | |
| download | drakx-63fc21d78e0699144ad0b7da8df6212a4609c233.tar drakx-63fc21d78e0699144ad0b7da8df6212a4609c233.tar.gz drakx-63fc21d78e0699144ad0b7da8df6212a4609c233.tar.bz2 drakx-63fc21d78e0699144ad0b7da8df6212a4609c233.tar.xz drakx-63fc21d78e0699144ad0b7da8df6212a4609c233.zip | |
always copy /etc/resolv.conf again
previous fix for mga#9326 was incomplete in that draklive's auto-install
would still have broke with a remote repositery (which we don't use but
it's better to have all cases cornered for the sake of it)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e5c04abc4..107a9090d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - force loading NSS modules (mga#9326) +- drakx-in-chroot: + o always copy /etc/resolv.conf again Version 15.33 - 4 April 2013 diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 4ffc345de..d5d893f3c 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -118,9 +118,7 @@ mkdir_p("$dir/dev"); eval { cp_af($_, "$dir$_") } foreach qw(/dev/root); #- if the DISPLAY is remote, we may need to resolve the name: -if ($remote_repository || $ENV{DISPLAY} !~ /^:/) { - eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/resolv.conf") }; -} +eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/resolv.conf") }; { chomp(my $kernel_version = `uname -r`); |