Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-03-11 10:08:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'more-iso-fixes' into ubuntu/master

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-02-26 10:15:59 +13:00
commit 9c4ce17909
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,10 +1,16 @@
livecd-rootfs (26.04.22) UNRELEASED; urgency=medium livecd-rootfs (26.04.22) UNRELEASED; urgency=medium
[ Oliver Gayot ]
* Pull the model from Launchpad's lp:canonical-models * Pull the model from Launchpad's lp:canonical-models
repo, instead of having it uploaded as part of livecd-rootfs. This repo, instead of having it uploaded as part of livecd-rootfs. This
indirection makes it possible to update the models without requiring a new indirection makes it possible to update the models without requiring a new
upload of livecd-rootfs every time. upload of livecd-rootfs every time.
[ Michael Hudson-Doyle ]
* Fix two more problems with livefs-built ISOs:
- Generate the for-iso squashfs in the right place for Kubuntu.
- Fix confusion about the kernel path on the ISO on riscv64.
-- Olivier Gayot <olivier.gayot@canonical.com> Tue, 24 Feb 2026 16:22:51 +0100 -- Olivier Gayot <olivier.gayot@canonical.com> Tue, 24 Feb 2026 16:22:51 +0100
livecd-rootfs (26.04.21) resolute; urgency=medium livecd-rootfs (26.04.21) resolute; urgency=medium

2
live-build/auto/build
View File

@ -576,7 +576,7 @@ if [ "${MAKE_ISO}" = "yes" ]; then
# create a for-iso.filesystem.squashfs that does. # create a for-iso.filesystem.squashfs that does.
if [ -z "$PASSES" ]; then if [ -z "$PASSES" ]; then
isobuild generate-sources --mountpoint=/cdrom > chroot/etc/apt/sources.list.d/cdrom.sources isobuild generate-sources --mountpoint=/cdrom > chroot/etc/apt/sources.list.d/cdrom.sources
create_squashfs chroot for-iso.filesystem.squashfs create_squashfs chroot ${PWD}/for-iso.filesystem.squashfs
fi fi
# Link kernel and initrd files. The ${thing#${PREFIX}} expansion strips # Link kernel and initrd files. The ${thing#${PREFIX}} expansion strips
# the PREFIX, so "livecd.ubuntu-server.kernel-generic" becomes # the PREFIX, so "livecd.ubuntu-server.kernel-generic" becomes

2
live-build/isobuilder/builder.py
View File

@ -268,7 +268,7 @@ class ISOBuilder:
target.hardlink_to(src) target.hardlink_to(src)
kernel_name = "vmlinuz" kernel_name = "vmlinuz"
if self.arch == "ppc64el": if self.arch in ("ppc64el", "riscv64"):
kernel_name = "vmlinux" kernel_name = "vmlinux"
with self.logger.logged( with self.logger.logged(