From: Martin Pitt <martin@piware.de>
Date: Sat, 3 Sep 2022 07:48:12 +0000 (+0200)
Subject: build-debian-toolbox: Fix systemd installation
X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=commitdiff_plain;h=1e02b574d361c9bfa8282c1b98e21d68ed1aae4e

build-debian-toolbox: Fix systemd installation

systemd is now pulled in/updated in the original container already, so
move the umounting earlier.

Also drop the deb.debian.org rewriting. Current VPN/DNS setup does the
right thing, and the changed apt sources format does not match this any
more.
---

diff --git a/build-debian-toolbox b/build-debian-toolbox
index 813e8d3..13ee84d 100755
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -14,8 +14,8 @@ podman exec -it $RELEASE sh -exc '
 # go-faster apt/dpkg
 echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/unsafe-io
 
-# location based redirector gets it wrong with company VPN; also add deb-src
-sed -i "s/deb.debian.org/ftp.de.debian.org/; /^deb\b/ { p; s/^deb/deb-src/ }" /etc/apt/sources.list
+# otherwise installing systemd fails
+umount /var/log/journal
 
 apt-get update
 apt-get install -y libnss-myhostname sudo eatmydata libcap2-bin
@@ -25,9 +25,6 @@ sed -i "s/nullok_secure/nullok/" /etc/pam.d/common-auth
 '
 
 toolbox run --container $RELEASE sh -exc '
-# otherwise installing systemd fails
-sudo umount /var/log/journal
-
 # useful hostname
 . /etc/os-release
 echo "${ID}-${VERSION_ID:-sid}" | sudo tee /etc/hostname