diff options
| -rwxr-xr-x | bin/debvm-create | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/bin/debvm-create b/bin/debvm-create index 09ee897..ca4de73 100755 --- a/bin/debvm-create +++ b/bin/debvm-create @@ -112,7 +112,6 @@ set -u ARCHITECTURE=$(dpkg --print-architecture) IMAGE=rootfs.ext4 -INCLUDE_PACKAGES=init SIZE=$((1024*1024*1024)) SKIP=, SSHKEY= @@ -242,43 +241,39 @@ case "$SUITE" in ;; esac -KERNEL_SUFFIX=-$ARCHITECTURE +KERNEL_ARCH=$ARCHITECTURE case "$ARCHITECTURE" in - amd64|arm64) - KERNEL_SUFFIX="-cloud-$ARCHITECTURE" - if test "$DEBVER" -le 9; then - KERNEL_SUFFIX="-$ARCHITECTURE" - fi - ;; armhf) - KERNEL_SUFFIX=-armmp + KERNEL_ARCH=armmp ;; i386) - KERNEL_SUFFIX=-686-pae + KERNEL_ARCH=686-pae ;; mips64el) - KERNEL_SUFFIX=-5kc-malta + KERNEL_ARCH=5kc-malta ;; mipsel) - KERNEL_SUFFIX=-4kc-malta + KERNEL_ARCH=4kc-malta ;; ppc64el) - KERNEL_SUFFIX=-powerpc64le + KERNEL_ARCH=powerpc64le ;; esac if ! check_skip kernel; then - INCLUDE_PACKAGES="$INCLUDE_PACKAGES,linux-image$KERNEL_SUFFIX" + set -- "--include=?or(?exact-name(linux-image-cloud-$KERNEL_ARCH),?exact-name(linux-image-$KERNEL_ARCH))" "$@" fi if test -n "$SSHKEY"; then - INCLUDE_PACKAGES="$INCLUDE_PACKAGES,openssh-server" + set -- --include=openssh-server "$@" fi if ! check_skip systemdnetwork; then # add a DNS resolver - INCLUDE_PACKAGES="$INCLUDE_PACKAGES,?exact-name(libnss-resolve)" - set -- "--customize-hook=$SHARE_DIR/customize-resolved.sh" "$@" + set -- \ + '--include=?exact-name(libnss-resolve)' \ + "--customize-hook=$SHARE_DIR/customize-resolved.sh" \ + "$@" fi # construct mmdebstrap options as $@: @@ -286,12 +281,11 @@ set -- \ --verbose \ --variant=apt \ --format=ext2 \ + --include=init \ "--architecture=$ARCHITECTURE" \ - "--include=$INCLUDE_PACKAGES" \ '--customize-hook=echo "LABEL=debvm / ext4 defaults 0 1" >"$1/etc/fstab"' \ "$@" - # set up a hostname set -- \ "--customize-hook=echo $VMNAME >"'"$1/etc/hostname"' \ |