From 91d446d93ed717b1082bb646fbef65cd1cbc25f5 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Fri, 10 Apr 2020 02:44:01 +0100
Subject: [PATCH] Fix permissions & ownership of copied /etc/resolv.conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: #857740

[tweaked by Raphaël Hertzog to fix the chown root:root call]
---
 scripts/build/chroot_resolv | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index 7066e53a6..b7957259e 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -54,7 +54,7 @@ case "${1}" in
 		if [ -f /etc/resolv.conf ]
 		then
 			# Copy resolv file
-			cp /etc/resolv.conf chroot/etc/resolv.conf
+			cp -a /etc/resolv.conf chroot/etc/resolv.conf
 		fi
 
 		# Creating stage file
@@ -70,7 +70,9 @@ case "${1}" in
 		if [ -e config/includes.chroot/etc/resolv.conf ]
 		then
 			# Copying local resolv.conf
-			cp -a config/includes.chroot/etc/resolv.conf chroot/etc/resolv.conf
+			cp config/includes.chroot/etc/resolv.conf chroot/etc/resolv.conf
+			chmod 644 chroot/etc/resolv.conf
+			chown root:root chroot/etc/resolv.conf
 			rm -f chroot/etc/resolv.conf.orig
 		elif [ -e chroot/etc/resolv.conf.orig ] || [ -L chroot/etc/resolv.conf.orig ]
 		then