Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dbungert/lp-2026225-surely' into ubuntu/master

Browse Source
This commit is contained in:
Dan Bungert 2023-09-07 21:31:20 -06:00
commit 4c6bb3c386
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,5 +1,6 @@
livecd-rootfs (23.10.34) UNRELEASED; urgency=medium
[ Steve Langasek ]
* Drop (outdated, inconsistent) /etc/hosts from ubuntu-server chroot
includes.
@ -11,6 +12,10 @@ livecd-rootfs (23.10.34) UNRELEASED; urgency=medium
* clean up references to obsolete pi subarchs no longer built, and remove
code that writes out /boot/firmware settings that are later clobbered
[ Dan Bungert ]
* desktop: adjust kernel to be in the live layer, to support changing which
kernel is installed rather than always using hwe. (LP: #2026225)
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 06 Sep 2023 18:28:06 -0700
livecd-rootfs (23.10.33) mantic; urgency=medium

4
live-build/auto/config
View File

@ -716,7 +716,6 @@ case $PROJECT in
*)
touch config/universe-enabled
PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS='generic-hwe-22.04'
# the standard layer, contains all base common packages for later layers
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
add_package standard cloud-init
@ -724,6 +723,7 @@ case $PROJECT in
add_task standard.live ubuntu-live
remove_package standard.live ubiquity-frontend-gtk
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
add_package standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
@ -1183,7 +1183,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
esac
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"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false

26
live-build/ubuntu/hooks/020-ubuntu-live.binary Executable file
View 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