Compare commits

...

6 Commits

Author SHA1 Message Date
Dimitri John Ledkov
eabde6cde5
releasing package livecd-rootfs version 23.10.58 2024-01-03 15:17:23 +00:00
Simon Poirier
0975e2a5dd
fix: add back systemd-resolved to buildd images.
systemd-resolved got moved out of the systemd package in kinetic and is
required for bootable buildd environement (as opposed to launchpad buildd)
(LP: #2007419)

(cherry picked from commit 3729e2ae948879a582f16ac5753646505ff6bc2d)
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2024-01-03 15:16:53 +00:00
Brian Murray
b96839c857 releasing package livecd-rootfs version 23.10.57 2023-12-06 11:30:43 -08:00
Brian Murray
48b5d89e15 arm: fix console parameter for ARM cloud-images (LP: #2036730) 2023-12-06 11:30:25 -08:00
Philip Roche
558d393333 Merge bugfix/ubuntu-cpc-LP-2038957-ppc64el-vmlinux-mantic into ubuntu/mantic [a=philroche] [r=andrew-cloke,vorlon]
fix: Enable snap preseeding with ppc64el images where /boot/vmlinux is used instead of /boot/vmlinuz. (LP: #2038957)

ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz. This
is then used to determine the kernel major minor version installed so that the correct apparmor features can be used
during snap preseeding. This preseeding was failing for ppc64el for the mantic 6.5 kernel as the /boot/vmlinuz
being checked did not exist.

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/454045
2023-10-27 12:50:15 +01:00
Philip Roche
07f26cb78e fix: Enable snap preseeding with ppc64el images where /boot/vmlinux is used instead of /boot/vmlinuz. (LP: #2038957)
ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz. This
is then used to determine the kernel major minor version installed so that the correct apparmor features can be used
during snap preseeding. This preseeding was failing for ppc64el for the mantic 6.5 kernel as the /boot/vmlinuz
being checked did not exist.
2023-10-11 11:45:36 +01:00
4 changed files with 45 additions and 2 deletions

21
debian/changelog vendored
View File

@ -1,3 +1,24 @@
livecd-rootfs (23.10.58) mantic; urgency=medium
[ Simon Poirier ]
* fix: add back systemd-resolved to buildd images.
-- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Wed, 03 Jan 2024 15:17:17 +0000
livecd-rootfs (23.10.57) mantic; urgency=medium
[ Heinrich Schuchardt ]
* arm: fix console parameter for ARM cloud-images (LP: #2036730)
-- Brian Murray <brian@ubuntu.com> Wed, 06 Dec 2023 11:30:35 -0800
livecd-rootfs (23.10.56) mantic; urgency=medium
* Enable snap preseeding with ppc64el images where /boot/vmlinux is used
instead of /boot/vmlinuz. (LP: #2038957)
-- Philip Roche <phil.roche@canonical.com> Wed, 11 Oct 2023 11:41:00 +0100
livecd-rootfs (23.10.55) mantic; urgency=medium
* fix: add 6.5 kernel appamor features to livecd-rootfs based on

View File

@ -1123,6 +1123,9 @@ case $SUBPROJECT in
add_package install build-essential
# Needed for LXD-based builds.
add_package install init
# Needed for bootable buildd systems which don't get injected
# nameserver configuration. (LP: 2007419)
add_package install systemd-resolved
# Not strictly build-essential, but traditionally present
# and a variety of things fail without it.
add_package install tzdata

View File

@ -768,9 +768,18 @@ snap_preseed() {
snap_validate_seed() {
local CHROOT_ROOT=$1
local kern_major_min=undefined
local boot_filename=undefined
# ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz
# We don't need to query the arch as we can use existence of the file to determine the boot file name. Both
# will never be present at the same time.
if [ -e ${CHROOT_ROOT}/boot/vmlinuz ]; then
kern_major_min=$(readlink --canonicalize --no-newline ${CHROOT_ROOT}/boot/vmlinuz | grep --extended-regexp --only-matching --max-count 1 '[0-9]+\.[0-9]+')
boot_filename=vmlinuz
elif [ -e ${CHROOT_ROOT}/boot/vmlinux ]; then
boot_filename=vmlinux
fi
if [ ${boot_filename} != undefined ]; then # we have a known boot file so we can proceed with checking for features to mount
kern_major_min=$(readlink --canonicalize --no-newline ${CHROOT_ROOT}/boot/${boot_filename} | grep --extended-regexp --only-matching --max-count 1 '[0-9]+\.[0-9]+')
if [ -d /usr/share/livecd-rootfs/live-build/apparmor/${kern_major_min} ]; then
# if an Ubuntu version has different kernel apparmor features between LTS and HWE kernels
# a snap pre-seeding issue can occur, where the incorrect apparmor features are reported

View File

@ -170,6 +170,16 @@ fi
psuedo_grub_probe > "${gprobe}"
chmod 755 "${gprobe}"
case $arch in
armhf|arm64)
# QEMU virt machine provides AMBA PrimeCell UART
serial_console='ttyAMA0'
;;
*)
serial_console='ttyS0'
;;
esac
# for Quantal and later, use /etc/default/grub.d functionality
# rather than modifying the grub configuration itself.
# This avoids the mess of having to do dpkg stuff
@ -186,7 +196,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
GRUB_TIMEOUT=0
# Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=${serial_console}"
# Set the grub console type
GRUB_TERMINAL=console