From 8506cb53ab24a19bbdbdef3cf6bb9030c9bc204f Mon Sep 17 00:00:00 2001 From: "paxchristi888@gmail.com" Date: Sun, 8 Dec 2019 08:10:02 +0000 Subject: don't copy /etc/resolv.conf if file exists, don't rm it on clean FossilOrigin-Name: 95401ee466066e750908e8594d431b4fac0dd21fa25991f57e734c31c6416c49 --- contrib/kiss-chroot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/kiss-chroot b/contrib/kiss-chroot index 372ef0a..52d5115 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; { -- cgit v1.2.3 From c23d684d27f840032c143fb9979b1bb81c75533e Mon Sep 17 00:00:00 2001 From: "paxchristi888@gmail.com" Date: Tue, 10 Dec 2019 09:12:26 +0000 Subject: Only copy resolv.conf from host if it doesn't exist FossilOrigin-Name: 0603524ea36fc440257d0dbdba783601a440b05dc7c0c94931a9f5b845f5ac69 --- contrib/kiss-chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/kiss-chroot b/contrib/kiss-chroot index 52d5115..42146f9 100755 --- a/contrib/kiss-chroot +++ b/contrib/kiss-chroot @@ -38,7 +38,7 @@ main() { } log Copying /etc/resolv.conf from host; { - [ ! -f "/$1/etc/resolv.conf" ] && cp /etc/resolv.conf "$1/etc" + [ -f "/$1/etc/resolv.conf" ] || cp /etc/resolv.conf "$1/etc" } log Entering chroot; { -- cgit v1.2.3