From e3867f2ebc73dda02a05267efed5b44dc9cb67bb Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sun, 22 Dec 2019 11:59:06 +0100 Subject: [PATCH] Remove default for hardened kernel --- alpine-make-vm-image | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/alpine-make-vm-image b/alpine-make-vm-image index 08649f8..143e720 100755 --- a/alpine-make-vm-image +++ b/alpine-make-vm-image @@ -35,9 +35,7 @@ # $ROOTFS is always included, don't specify them here. # Default is "scsi virtio". # -# -k --kernel-flavor KERNEL_FLAVOR The kernel flavour to install; vanilla, virt, hardened, -# or virthardened (the last two only up to Alpine 3.7). -# Default is virt (Alpine 3.8+) or virthardened. +# -k --kernel-flavor KERNEL_FLAVOR The kernel flavour to install; virt (default), or vanilla. # # --keys-dir KEYS_DIR Path of directory with Alpine keys to copy into the image. # Default is /etc/apk/keys. If does not exist, keys for @@ -331,7 +329,7 @@ done : ${IMAGE_FORMAT:=} : ${IMAGE_SIZE:="2G"} : ${INITFS_FEATURES:="scsi virtio"} -: ${KERNEL_FLAVOR:=} +: ${KERNEL_FLAVOR:="virt"} : ${KEYS_DIR:="/etc/apk/keys"} : ${PACKAGES:=} : ${REPOS_FILE:="/etc/apk/repositories"} @@ -434,12 +432,6 @@ _apk add --root . mkinitfs setup_mkinitfs . "base $ROOTFS $INITFS_FEATURES" #----------------------------------------------------------------------- -if [ -z "$KERNEL_FLAVOR" ]; then - _apk search --root . --exact --quiet linux-virt | grep -q . \ - && KERNEL_FLAVOR='virt' \ - || KERNEL_FLAVOR='virthardened' -fi - einfo "Installing kernel linux-$KERNEL_FLAVOR" _apk add --root . linux-$KERNEL_FLAVOR