josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

hooks/merged-usr: acquire native architecture from apt-config

Browse source 
`dpkg --print-architecture` will be wrong when creating a foreign
architecture chroot and we cannot chroot() as the chroot directory is
still empty.
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-05-26 07:27:24 +02:00
parent cffd47e087
commit 790294ddca
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hooks/merged-usr/setup00.sh
View file

@ -47,11 +47,8 @@ fi
TARGET="$1" TARGET="$1"
if [ -e "$TARGET/var/lib/dpkg/arch" ]; then
ARCH=$(head -1 "$TARGET/var/lib/dpkg/arch")
else
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
fi eval "$(APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-config shell ARCH Apt::Architecture)"
if [ -e /usr/share/debootstrap/functions ]; then if [ -e /usr/share/debootstrap/functions ]; then
. /usr/share/debootstrap/functions . /usr/share/debootstrap/functions