xfnw/alpine-make-vm-image
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove default for hardened kernel

Browse source
This commit is contained in:
Jakub Jirutka 2019-12-22 11:59:06 +01:00
parent 8fdd32d72d
commit e3867f2ebc
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
alpine-make-vm-image
View file

@ -35,9 +35,7 @@
# $ROOTFS is always included, don't specify them here. # $ROOTFS is always included, don't specify them here.
# Default is "scsi virtio". # Default is "scsi virtio".
# #
# -k --kernel-flavor KERNEL_FLAVOR The kernel flavour to install; vanilla, virt, hardened, # -k --kernel-flavor KERNEL_FLAVOR The kernel flavour to install; virt (default), or vanilla.
# or virthardened (the last two only up to Alpine 3.7).
# Default is virt (Alpine 3.8+) or virthardened.
# #
# --keys-dir KEYS_DIR Path of directory with Alpine keys to copy into the image. # --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 # Default is /etc/apk/keys. If does not exist, keys for
@ -331,7 +329,7 @@ done
: ${IMAGE_FORMAT:=} : ${IMAGE_FORMAT:=}
: ${IMAGE_SIZE:="2G"} : ${IMAGE_SIZE:="2G"}
: ${INITFS_FEATURES:="scsi virtio"} : ${INITFS_FEATURES:="scsi virtio"}
: ${KERNEL_FLAVOR:=} : ${KERNEL_FLAVOR:="virt"}
: ${KEYS_DIR:="/etc/apk/keys"} : ${KEYS_DIR:="/etc/apk/keys"}
: ${PACKAGES:=} : ${PACKAGES:=}
: ${REPOS_FILE:="/etc/apk/repositories"} : ${REPOS_FILE:="/etc/apk/repositories"}
@ -434,12 +432,6 @@ _apk add --root . mkinitfs
setup_mkinitfs . "base $ROOTFS $INITFS_FEATURES" 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" einfo "Installing kernel linux-$KERNEL_FLAVOR"
_apk add --root . linux-$KERNEL_FLAVOR _apk add --root . linux-$KERNEL_FLAVOR