From e4befb9e323d74d2e5d4a284df51d6becf3b42cc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 4 Apr 2013 16:31:14 +0000 Subject: 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) --- perl-install/install/NEWS | 2 ++ 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`); -- cgit v1.2.1