diff options
| -rwxr-xr-x | debvm-create | 10 | ||||
| -rwxr-xr-x | debvm-run | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/debvm-create b/debvm-create index 7cc5e31..a903350 100755 --- a/debvm-create +++ b/debvm-create @@ -205,8 +205,7 @@ if test "$DEBVER" -le 8; then # Use obsolete and expired keys. set -- '--keyring=/usr/share/keyrings/debian-archive-removed-keys.gpg' "$@" set -- --aptopt='Apt::Key::gpgvcommand "/usr/libexec/mmdebstrap/gpgvnoexpkeysig"' "$@" - # chfn does not work, because libpam-runtime.postinst is late setting up /etc/pam.d/common-auth et al, see #1026765 - set -- --extract-hook='chroot "$1" pam-auth-update --package --force' "$@" + set -- --hook-dir=/usr/share/mmdebstrap/hooks/jessie-or-older "$@" fi if test "$DEBVER" -ge 12; then @@ -221,8 +220,11 @@ set -ex mmdebstrap "$@" -truncate -s "$SIZE" "$IMAGE" -/sbin/resize2fs "$IMAGE" +IMAGESIZE=$(stat -c %s "$IMAGE") +if test "$IMAGESIZE" -lt "$SIZE"; then + truncate -s "$SIZE" "$IMAGE" + /sbin/resize2fs "$IMAGE" +fi /sbin/tune2fs -L debvm -i 0 -O extents,uninit_bg,dir_index,has_journal "$IMAGE" # Must fsck after tune2fs: https://ext4.wiki.kernel.org/index.php/UpgradeToExt4 /sbin/fsck.ext4 -fDp "$IMAGE" @@ -140,9 +140,9 @@ else ;; esac fi -if test "$MAX_SMP" -gt 1; then +if test -z "$MAX_SMP" || test "$MAX_SMP" -gt 1; then NPROC=$(nproc) - test "$NPROC" -gt "$MAX_SMP" && NPROC=$MAX_SMP + test -n "$MAX_SMP" && test "$NPROC" -gt "$MAX_SMP" && NPROC=$MAX_SMP set -- -smp "$NPROC" "$@" fi |