build-debian-toolbox: Fix systemd installation master
authorMartin Pitt <martin@piware.de>
Sat, 3 Sep 2022 07:48:12 +0000 (09:48 +0200)
committerMartin Pitt <martin@piware.de>
Sat, 3 Sep 2022 07:48:45 +0000 (09:48 +0200)
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.

build-debian-toolbox

index 813e8d37d9e0aca033871e40e27f0a8140a5419f..13ee84dba55fd4fd8442a29aeff5bab68937259c 100755 (executable)
@@ -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