From f453d0f99ff623fa479e2d0020fc587511ff16a9 Mon Sep 17 00:00:00 2001
From: Adam Schaefers <paxchristi888@gmail.com>
Date: Sun, 8 Dec 2019 00:10:02 -0800
Subject: [PATCH 1/2] don't copy /etc/resolv.conf if file exists, don't rm it
 on clean

---
 contrib/kiss-chroot | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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; {

From 9985344d25b1ba0fc538d74e078b5a3970486dae Mon Sep 17 00:00:00 2001
From: Adam Schaefers <paxchristi888@gmail.com>
Date: Tue, 10 Dec 2019 01:12:26 -0800
Subject: [PATCH 2/2] Only copy resolv.conf from host if it doesn't exist

---
 contrib/kiss-chroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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; {