mirror of
https://git.launchpad.net/livecd-rootfs
synced 2026-04-16 05:51:09 +00:00
Merge branch 'fix/2146567' into ubuntu/master
This commit is contained in:
commit
621eb44506
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -3,6 +3,11 @@ livecd-rootfs (26.04.32) UNRELEASED; urgency=medium
|
|||||||
[ Alfonso Sanchez-Beato ]
|
[ Alfonso Sanchez-Beato ]
|
||||||
* Add support for building Ubuntu Core 26 images.
|
* Add support for building Ubuntu Core 26 images.
|
||||||
|
|
||||||
|
[ Michael Hudson-Doyle & Simon Poirier ]
|
||||||
|
* Add a hook 03-initramfs-enforcement.chroot to many ISO builds to ensure
|
||||||
|
that the live layer gets an initramfs built with casper and
|
||||||
|
initramfs-tools. (LP: #2146567)
|
||||||
|
|
||||||
-- Florent 'Skia' Jacquet <skia@ubuntu.com> Tue, 14 Apr 2026 12:56:52 +0200
|
-- Florent 'Skia' Jacquet <skia@ubuntu.com> Tue, 14 Apr 2026 12:56:52 +0200
|
||||||
|
|
||||||
livecd-rootfs (26.04.31) resolute; urgency=medium
|
livecd-rootfs (26.04.31) resolute; urgency=medium
|
||||||
|
|||||||
1
live-build/edubuntu/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/edubuntu/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/kubuntu/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/kubuntu/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/lubuntu/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/lubuntu/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/ubuntu-budgie/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/ubuntu-budgie/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/ubuntu-mate/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/ubuntu-mate/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/ubuntucinnamon/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/ubuntucinnamon/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/ubuntukylin/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/ubuntukylin/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
1
live-build/ubuntustudio/hooks/03-initramfs-enforcement.chroot
Symbolic link
1
live-build/ubuntustudio/hooks/03-initramfs-enforcement.chroot
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../xubuntu/hooks/03-initramfs-enforcement.chroot
|
||||||
34
live-build/xubuntu/hooks/03-initramfs-enforcement.chroot
Executable file
34
live-build/xubuntu/hooks/03-initramfs-enforcement.chroot
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
#!/bin/bash -e
|
||||||
|
# vi: ts=4 noexpandtab
|
||||||
|
|
||||||
|
# In a kernel layer, we need a freshly updated initrd (to ensure it
|
||||||
|
# has been casperized with an appropriate config). A binary hook will
|
||||||
|
# pull this out to be a separate build artifact to eventually end up
|
||||||
|
# in /casper on the generated ISO.
|
||||||
|
|
||||||
|
# In all lower layers, having an initrd just wastes space, as curtin
|
||||||
|
# will always call update-initramfs after the layer has been copied to
|
||||||
|
# the target system.
|
||||||
|
|
||||||
|
# The netboot "layers" are not made into squashfses so there's no need
|
||||||
|
# to do anything in those.
|
||||||
|
|
||||||
|
. /root/config/common
|
||||||
|
. /root/config/functions
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
if ! is_live_layer "${PASS}"; then
|
||||||
|
rm -f /boot/initrd.img-*
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
|
||||||
|
export CASPER_GENERATE_UUID=1
|
||||||
|
EOF
|
||||||
|
cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf
|
||||||
|
LAYERFS_PATH=${PASS}.squashfs
|
||||||
|
EOF
|
||||||
|
# As this hook has deleted the initrds from lower layers we need to
|
||||||
|
# pass -c -k all to update-initramfs here (-u will do nothing)
|
||||||
|
update-initramfs -c -k all
|
||||||
Loading…
x
Reference in New Issue
Block a user