mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-15 18:54:09 +00:00
Compare commits
6 Commits
ubuntu/mas
...
23.10.58
Author | SHA1 | Date | |
---|---|---|---|
|
eabde6cde5 | ||
|
0975e2a5dd | ||
|
b96839c857 | ||
|
48b5d89e15 | ||
|
558d393333 | ||
|
07f26cb78e |
21
debian/changelog
vendored
21
debian/changelog
vendored
@ -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
|
livecd-rootfs (23.10.55) mantic; urgency=medium
|
||||||
|
|
||||||
* fix: add 6.5 kernel appamor features to livecd-rootfs based on
|
* fix: add 6.5 kernel appamor features to livecd-rootfs based on
|
||||||
|
@ -1123,6 +1123,9 @@ case $SUBPROJECT in
|
|||||||
add_package install build-essential
|
add_package install build-essential
|
||||||
# Needed for LXD-based builds.
|
# Needed for LXD-based builds.
|
||||||
add_package install init
|
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
|
# Not strictly build-essential, but traditionally present
|
||||||
# and a variety of things fail without it.
|
# and a variety of things fail without it.
|
||||||
add_package install tzdata
|
add_package install tzdata
|
||||||
|
@ -768,9 +768,18 @@ snap_preseed() {
|
|||||||
snap_validate_seed() {
|
snap_validate_seed() {
|
||||||
local CHROOT_ROOT=$1
|
local CHROOT_ROOT=$1
|
||||||
local kern_major_min=undefined
|
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
|
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 [ -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
|
# 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
|
# a snap pre-seeding issue can occur, where the incorrect apparmor features are reported
|
||||||
|
@ -170,6 +170,16 @@ fi
|
|||||||
psuedo_grub_probe > "${gprobe}"
|
psuedo_grub_probe > "${gprobe}"
|
||||||
chmod 755 "${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
|
# for Quantal and later, use /etc/default/grub.d functionality
|
||||||
# rather than modifying the grub configuration itself.
|
# rather than modifying the grub configuration itself.
|
||||||
# This avoids the mess of having to do dpkg stuff
|
# This avoids the mess of having to do dpkg stuff
|
||||||
@ -186,7 +196,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
|
|||||||
GRUB_TIMEOUT=0
|
GRUB_TIMEOUT=0
|
||||||
|
|
||||||
# Set the default commandline
|
# 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
|
# Set the grub console type
|
||||||
GRUB_TERMINAL=console
|
GRUB_TERMINAL=console
|
||||||
|
Loading…
x
Reference in New Issue
Block a user