manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chroot_resolve: fix broken network connectivity 

introduced by an issue with the implementation of
91d446d93e

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
This commit is contained in:
Lyndon Brown 2020-04-23 19:55:04 +01:00 committed by Raphaël Hertzog
parent d79c96232b
commit 10bbb095a8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build/chroot_resolv
View File

@ -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