summaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2009-12-15 14:27:36 (GMT)
committerOtavio Salvador <otavio@debian.org>2009-12-15 14:27:36 (GMT)
commita887497569f5abcd4a3262330af62a51ba07fa9c (patch)
tree0461ca0afedda43bc8faadeb2f5d9220d9aaea19 /functions
parentf2206a911db629e833d0b1f32bf10045cf1922c3 (diff)
downloaddebootstrap-a887497569f5abcd4a3262330af62a51ba07fa9c.zip
debootstrap-a887497569f5abcd4a3262330af62a51ba07fa9c.tar.gz
debootstrap-a887497569f5abcd4a3262330af62a51ba07fa9c.tar.bz2
Apply patch from Vagrant Cascadian <vagrant+bugs@freegeek.org> not fail if resolv.conf is a broken symlink (closes: #390647).
r61715
Diffstat (limited to 'functions')
-rw-r--r--functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/functions b/functions
index 33b5a46..0ba5ae7 100644
--- a/functions
+++ b/functions
@@ -836,7 +836,7 @@ in_target () {
conditional_cp () {
if [ ! -e "$2/$1" ]; then
- if [ -L "$1" ]; then
+ if [ -L "$1" ] && [ -e "$1" ]; then
cat "$1" >"$2/$1"
elif [ -e "$1" ]; then
cp -a "$1" "$2/$1"