aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2019-12-19 08:33:02 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2019-12-19 08:33:02 +0000
commit241bce9357e445491205e6452271df84d24e72d9 (patch)
treec1947c661717d4c42a32e24d039150bbae15c7be
parentbb74b3d77bf408a63be41dde1bbc60ea3222ee91 (diff)
parent12329bc83d280f8f9f8f276ecead2565373d58ca (diff)
downloadcpt-241bce9357e445491205e6452271df84d24e72d9.tar.gz
Merge branch 'master' of github.com:kissx/kiss
FossilOrigin-Name: 68cd0d98c4155b0c581d75235570a1cb8e9e82dfdc2f630782f2594fcafff25f
-rwxr-xr-xcontrib/kiss-chroot3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/kiss-chroot b/contrib/kiss-chroot
index 372ef0a..42146f9 100755
--- a/contrib/kiss-chroot
+++ b/contrib/kiss-chroot
@@ -20,7 +20,6 @@ clean() {
log Cleaning leftover host files; {
rm -f "$1/root/.ash_history"
- rm -f "$1/etc/resolv.conf"
}
}
@@ -39,7 +38,7 @@ main() {
}
log Copying /etc/resolv.conf from host; {
- cp /etc/resolv.conf "$1/etc"
+ [ -f "/$1/etc/resolv.conf" ] || cp /etc/resolv.conf "$1/etc"
}
log Entering chroot; {