From 102adb560cdeb584825f25d90522ea05ad8fc93d Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 11 Jan 2022 02:21:51 -0500 Subject: wait wtf lol --- selfstrap | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/selfstrap b/selfstrap index fba576e..ff8408b 100755 --- a/selfstrap +++ b/selfstrap @@ -351,9 +351,9 @@ dpkg_configure_from_apt_actions() preinst=/var/lib/dpkg/info/${package}${multiarch}.preinst if [ -x "$TARGET"/"$preinst" ]; then extract_tmp_ci "$deb" - prepare_chroot "$TARGET" + # prepare_chroot "$TARGET" verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$preinst" install - cleanup_chroot "$TARGET" + # cleanup_chroot "$TARGET" remove_tmp_ci fi ;; @@ -362,9 +362,9 @@ dpkg_configure_from_apt_actions() postinst=/var/lib/dpkg/info/${package}${multiarch}.postinst if [ -x "$TARGET"/"$postinst" ]; then extract_tmp_ci "$deb" - prepare_chroot "$TARGET" + # prepare_chroot "$TARGET" verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$postinst" configure - cleanup_chroot "$TARGET" + # cleanup_chroot "$TARGET" remove_tmp_ci fi ;; @@ -497,6 +497,9 @@ if [ "$REAL_APT_INSTALL" ]; then # 1. binaries used by dpkg 'inst' scripts. # 2. /etc/passwd and /etc/group so that 'chown' works + prepare_chroot "$TARGET" + trap 'cleanup_chroot "$TARGET"' EXIT + # Unpack required packages. Handles (1) # Note: populate_rootfs() already created a necessary symlink /usr/bin/awk -> /usr/bin/mawk apt_extract $required_packages eatmydata @@ -506,8 +509,6 @@ if [ "$REAL_APT_INSTALL" ]; then # An alternative (used by debootstrap) is to configure base-passwd install_etc_passwd - prepare_chroot "$TARGET" - trap 'cleanup_chroot "$TARGET"' EXIT apt_get install -y $required_packages $EXTRA_PACKAGES else apt_extract $required_packages -- cgit v1.2.3