From 10bbb095a8bab26a91288f737d464c4d025d8682 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 23 Apr 2020 19:55:04 +0100 Subject: chroot_resolve: fix broken network connectivity introduced by an issue with the implementation of 91d446d93ed717b1082bb646fbef65cd1cbc25f5 the introduced of that commit caused builds to fail doing `apt-get update` or downloading packages and such. this tweak fixes the problem. Gbp-Dch: Ignore --- 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 25da6d549..f908b7f6e 100755 --- a/scripts/build/chroot_resolv +++ b/scripts/build/chroot_resolv @@ -54,7 +54,9 @@ case "${1}" in if [ -f /etc/resolv.conf ] then # Copy resolv file - cp -a /etc/resolv.conf chroot/etc/resolv.conf + cp /etc/resolv.conf chroot/etc/resolv.conf + chmod 644 chroot/etc/resolv.conf + Chroot chroot "chown root:root /etc/resolv.conf" fi # Creating stage file @@ -75,7 +77,7 @@ case "${1}" in # Copying local 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 + Chroot chroot "chown root:root /etc/resolv.conf" rm -f chroot/etc/resolv.conf.orig elif [ -e chroot/etc/resolv.conf.orig ] || [ -L chroot/etc/resolv.conf.orig ] then -- cgit v1.2.3