diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-01-11 16:17:41 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:39 +0100 |
| commit | a7334c6c16f7c1b0d2037fba858be029c0822ce5 (patch) | |
| tree | 6f5d6018dc5d474f3aade801fe2bc4d0c1bdd1db /helpers | |
| parent | b4d2797d26f875479ec43c033532a36b1a5c0d72 (diff) | |
| download | live-build-a7334c6c16f7c1b0d2037fba858be029c0822ce5.zip live-build-a7334c6c16f7c1b0d2037fba858be029c0822ce5.tar.gz | |
Prefering local resolv.conf over truncated one.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_chroot_resolv | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index afa3036..5dcaf42 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 |