commit 1d1b50218a614ec2a39c12ac227345577e4140f4
parent d3cf21083f006d858a5ec39dbb870cb7879c5fd8
Author: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 19 Dec 2019 08:33:02 +0000
Merge branch 'master' of github.com:kissx/kiss
Diffstat:
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git 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; {