From a7334c6c16f7c1b0d2037fba858be029c0822ce5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 11 Jan 2009 16:17:41 +0100 Subject: Prefering local resolv.conf over truncated one. --- helpers/lh_chroot_resolv | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'helpers') diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index afa303680..5dcaf427a 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -76,7 +76,12 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ -e chroot/etc/resolv.conf.orig ] + if [ -e config/chroot_local-includes/etc/resolv.conf ] + then + # Copying local resolv.conf + cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf + rm -f chroot/etc/resolv.conf.orig + elif [ -e chroot/etc/resolv.conf.orig ] then # Restoring resolv file or symlink mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf -- cgit v1.2.3