From b1c3aecd289434670fd488a2ce04d26f3c8d7cd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 7 Feb 2012 10:04:51 +0100 Subject: Handling /etc/resolv.conf even if it's a dangling symlink like with resolv.conf, thanks to Stephane Graber (Closes: #657640). --- scripts/build/lb_chroot_resolv | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts/build/lb_chroot_resolv') diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv index d405924b6..d47c3edbf 100755 --- a/scripts/build/lb_chroot_resolv +++ b/scripts/build/lb_chroot_resolv @@ -51,6 +51,10 @@ case "${1}" in # If you want to have a custom resolv.conf, please # overwrite it with normal local_includes mechanism. Truncate chroot/etc/resolv.conf.orig + elif [ -L chroot/etc/resolv.conf ] + then + # Move resolv.conf aside if it's a symlink (likely resolvconf) + mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig fi if [ -f /etc/resolv.conf ] @@ -77,7 +81,7 @@ case "${1}" in # Copying local resolv.conf cp -a config/includes.chroot/etc/resolv.conf chroot/etc/resolv.conf rm -f chroot/etc/resolv.conf.orig - elif [ -e chroot/etc/resolv.conf.orig ] + elif [ -e chroot/etc/resolv.conf.orig ] || [ -L 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