diff options
| -rw-r--r-- | perl-install/install/NEWS | 4 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 2ff545106..3afe3a6b8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- drakx-in-chroot: + o do not copy /etc/resolv.conf in chroot if not using either remote + display or remote repository (thus fixing goup lookups, mga#9326) + Version 15.32 - 31 March 2013 - fix detecting Xen hard disks (mga#9546) diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 43917fff7..d751896c7 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -118,7 +118,9 @@ mkdir_p("$dir/dev"); eval { cp_af($_, "$dir$_") } foreach qw(/dev/root); #- if the DISPLAY is remote, we may need to resolve the name: -eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION$_") }; +if ($remote_repository || $ENV{DISPLAY} !~ /^:/) { + eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION$_") }; +} { chomp(my $kernel_version = `uname -r`); |