From 013b5b24017f524720a2d34d5d83b0090187c99c Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 17 Jan 2023 14:54:10 +0100 Subject: debvm-create: install only one kernel image The apt pattern ?or does not short-circuit. It installs any pattern matching one of the arguments. On amd64, we thus get both the cloud and the non-cloud variant. There aren't that many good options to fix this, so the next best way is using a hook and running apt again, which is suboptimal in terms of repeated triggers, but likely the best we can do at present. --- bin/debvm-create | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'bin/debvm-create') diff --git a/bin/debvm-create b/bin/debvm-create index 637d613..c554165 100755 --- a/bin/debvm-create +++ b/bin/debvm-create @@ -72,7 +72,8 @@ cmdline and passes it as C to B. =item B skips installing a linux kernel image. -This can be useful to install a custom kernel or to install a different kernel variant than is selected by default. +This can be useful to install a kernel without a package. +If a kernel is installed via B option C<--include>, automtatic kernel installation is automatically skipped. =item B @@ -224,33 +225,8 @@ check_skip() { esac } -KERNEL_ARCH=$ARCHITECTURE -case "$ARCHITECTURE" in - armhf) - KERNEL_ARCH=armmp - ;; - hppa) - KERNEL_ARCH=parisc - ;; - i386) - KERNEL_ARCH=686-pae - ;; - mips64el) - KERNEL_ARCH=5kc-malta - ;; - mipsel) - KERNEL_ARCH=4kc-malta - ;; - ppc64) - KERNEL_ARCH=powerpc64 - ;; - ppc64el) - KERNEL_ARCH=powerpc64le - ;; -esac - if ! check_skip kernel; then - set -- "--include=?not(?virtual)?or(?exact-name(linux-image-cloud-$KERNEL_ARCH),?exact-name(linux-image-$KERNEL_ARCH),?exact-name(linux-image-generic))" "$@" + set -- "--customize-hook=$SHARE_DIR/customize-kernel.sh" "$@" fi # construct mmdebstrap options as $@: -- cgit v1.2.3