diff options
Diffstat (limited to 'selfstrap')
-rwxr-xr-x | selfstrap | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -351,9 +351,9 @@ dpkg_configure_from_apt_actions() | |||
351 | preinst=/var/lib/dpkg/info/${package}${multiarch}.preinst | 351 | preinst=/var/lib/dpkg/info/${package}${multiarch}.preinst |
352 | if [ -x "$TARGET"/"$preinst" ]; then | 352 | if [ -x "$TARGET"/"$preinst" ]; then |
353 | extract_tmp_ci "$deb" | 353 | extract_tmp_ci "$deb" |
354 | prepare_chroot "$TARGET" | 354 | # prepare_chroot "$TARGET" |
355 | verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$preinst" install | 355 | verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$preinst" install |
356 | cleanup_chroot "$TARGET" | 356 | # cleanup_chroot "$TARGET" |
357 | remove_tmp_ci | 357 | remove_tmp_ci |
358 | fi | 358 | fi |
359 | ;; | 359 | ;; |
@@ -362,9 +362,9 @@ dpkg_configure_from_apt_actions() | |||
362 | postinst=/var/lib/dpkg/info/${package}${multiarch}.postinst | 362 | postinst=/var/lib/dpkg/info/${package}${multiarch}.postinst |
363 | if [ -x "$TARGET"/"$postinst" ]; then | 363 | if [ -x "$TARGET"/"$postinst" ]; then |
364 | extract_tmp_ci "$deb" | 364 | extract_tmp_ci "$deb" |
365 | prepare_chroot "$TARGET" | 365 | # prepare_chroot "$TARGET" |
366 | verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$postinst" configure | 366 | verbosely ${CHROOT_PROG:-chroot} "$TARGET" "$postinst" configure |
367 | cleanup_chroot "$TARGET" | 367 | # cleanup_chroot "$TARGET" |
368 | remove_tmp_ci | 368 | remove_tmp_ci |
369 | fi | 369 | fi |
370 | ;; | 370 | ;; |
@@ -497,6 +497,9 @@ if [ "$REAL_APT_INSTALL" ]; then | |||
497 | # 1. binaries used by dpkg 'inst' scripts. | 497 | # 1. binaries used by dpkg 'inst' scripts. |
498 | # 2. /etc/passwd and /etc/group so that 'chown' works | 498 | # 2. /etc/passwd and /etc/group so that 'chown' works |
499 | 499 | ||
500 | prepare_chroot "$TARGET" | ||
501 | trap 'cleanup_chroot "$TARGET"' EXIT | ||
502 | |||
500 | # Unpack required packages. Handles (1) | 503 | # Unpack required packages. Handles (1) |
501 | # Note: populate_rootfs() already created a necessary symlink /usr/bin/awk -> /usr/bin/mawk | 504 | # Note: populate_rootfs() already created a necessary symlink /usr/bin/awk -> /usr/bin/mawk |
502 | apt_extract $required_packages eatmydata | 505 | apt_extract $required_packages eatmydata |
@@ -506,8 +509,6 @@ if [ "$REAL_APT_INSTALL" ]; then | |||
506 | # An alternative (used by debootstrap) is to configure base-passwd | 509 | # An alternative (used by debootstrap) is to configure base-passwd |
507 | install_etc_passwd | 510 | install_etc_passwd |
508 | 511 | ||
509 | prepare_chroot "$TARGET" | ||
510 | trap 'cleanup_chroot "$TARGET"' EXIT | ||
511 | apt_get install -y $required_packages $EXTRA_PACKAGES | 512 | apt_get install -y $required_packages $EXTRA_PACKAGES |
512 | else | 513 | else |
513 | apt_extract $required_packages | 514 | apt_extract $required_packages |