summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-11 16:17:41 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:39 +0100
commita7334c6c16f7c1b0d2037fba858be029c0822ce5 (patch)
tree6f5d6018dc5d474f3aade801fe2bc4d0c1bdd1db
parentb4d2797d26f875479ec43c033532a36b1a5c0d72 (diff)
downloadvyos-live-build-a7334c6c16f7c1b0d2037fba858be029c0822ce5.tar.gz
vyos-live-build-a7334c6c16f7c1b0d2037fba858be029c0822ce5.zip
Prefering local resolv.conf over truncated one.
-rwxr-xr-xhelpers/lh_chroot_resolv7
1 files changed, 6 insertions, 1 deletions
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