mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-01 21:21:42 +00:00
desktop: place kernel in the live layer
Placing the kernel in the live layer allows for selecting at install time which kernel to install.
This commit is contained in:
parent
61c1b9bacb
commit
c00bbf3fb3
@ -716,7 +716,6 @@ case $PROJECT in
|
|||||||
*)
|
*)
|
||||||
touch config/universe-enabled
|
touch config/universe-enabled
|
||||||
PASSES_TO_LAYERS="true"
|
PASSES_TO_LAYERS="true"
|
||||||
KERNEL_FLAVOURS='generic-hwe-22.04'
|
|
||||||
# the standard layer, contains all base common packages for later layers
|
# the standard layer, contains all base common packages for later layers
|
||||||
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
|
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
|
||||||
add_package standard cloud-init
|
add_package standard cloud-init
|
||||||
@ -724,6 +723,7 @@ case $PROJECT in
|
|||||||
add_task standard.live ubuntu-live
|
add_task standard.live ubuntu-live
|
||||||
remove_package standard.live ubiquity-frontend-gtk
|
remove_package standard.live ubiquity-frontend-gtk
|
||||||
add_snap standard.live ubuntu-desktop-installer/classic
|
add_snap standard.live ubuntu-desktop-installer/classic
|
||||||
|
add_package standard.live linux-generic-hwe-22.04 casper
|
||||||
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
|
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
|
||||||
add_package standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
|
add_package standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
|
||||||
|
|
||||||
@ -1183,7 +1183,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
case $PROJECT:${SUBPROJECT:-} in
|
case $PROJECT:${SUBPROJECT:-} in
|
||||||
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*)
|
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:)
|
||||||
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
||||||
KERNEL_FLAVOURS=none
|
KERNEL_FLAVOURS=none
|
||||||
BINARY_REMOVE_LINUX=false
|
BINARY_REMOVE_LINUX=false
|
||||||
|
26
live-build/ubuntu/hooks/020-ubuntu-live.binary
Executable file
26
live-build/ubuntu/hooks/020-ubuntu-live.binary
Executable file
@ -0,0 +1,26 @@
|
|||||||
|
#! /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
|
||||||
|
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
|
||||||
|
|
||||||
|
mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic-hwe
|
||||||
|
mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic-hwe
|
||||||
|
chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic-hwe ${PWD}/livecd.${PROJECT}.kernel-generic-hwe
|
Loading…
x
Reference in New Issue
Block a user