diff --git a/live-build/auto/config b/live-build/auto/config index f90611d7..c528e36d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1223,7 +1223,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in esac case $PROJECT:${SUBPROJECT:-} in - ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:) + ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*) OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false diff --git a/live-build/ubuntu/hooks/020-ubuntu-live.binary b/live-build/ubuntu/hooks/020-ubuntu-live.binary deleted file mode 100755 index 7f44aad8..00000000 --- a/live-build/ubuntu/hooks/020-ubuntu-live.binary +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh - -# Kernels are deliberately installed into the live layer for Subiquity -# installers. This provides the ability to select a different kernel later, a -# key function for OEM support and a general capability for Subiquity. - -set -eux - -case ${PASS:-} in - minimal.standard.live) - ;; - *) - exit 0 - ;; -esac - -if [ -n "${SUBPROJECT:-}" ]; then - echo "We don't run Ubuntu Desktop hooks for this project." -fi - -. config/binary -. config/functions - -PROJECT=$PROJECT${SUBARCH:+-$SUBARCH} - -mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic -mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic -chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic