Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-22 08:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refer to LB_DISTRIBUTION, not SUITE, in the ubuntu-mini-iso binary hook.

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2024-12-06 09:56:55 +13:00
parent e2c2b1c2cb
commit 524c0f5c4e
2 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,3 +1,9 @@
livecd-rootfs (25.04.6) UNRELEASED; urgency=medium
* Refer to LB_DISTRIBUTION, not SUITE, in the ubuntu-mini-iso binary hook.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 06 Dec 2024 09:56:21 +1300
livecd-rootfs (25.04.5) plucky; urgency=medium livecd-rootfs (25.04.5) plucky; urgency=medium
* Fix ubuntu-mini-iso build, by using script from debian-cd to create a * Fix ubuntu-mini-iso build, by using script from debian-cd to create a

4
live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
View File

@ -23,7 +23,7 @@ EOF
chroot chroot update-initramfs -u chroot chroot update-initramfs -u
git clone https://git.launchpad.net/~ubuntu-cdimage/debian-cd/+git/ubuntu debian-cd git clone https://git.launchpad.net/~ubuntu-cdimage/debian-cd/+git/ubuntu debian-cd
export BASEDIR=$(readlink -f debian-cd) DIST=$SUITE export BASEDIR=$(readlink -f debian-cd) DIST=$LB_DISTRIBUTION
cat > apt.conf <<EOF cat > apt.conf <<EOF
Dir "$(pwd)/chroot"; Dir "$(pwd)/chroot";
@ -34,7 +34,7 @@ case $ARCH in
mkdir -p "ubuntu-mini-iso/amd64/tree/casper" mkdir -p "ubuntu-mini-iso/amd64/tree/casper"
cp "$KERNEL" ubuntu-mini-iso/amd64/tree/casper/filesystem.kernel-generic cp "$KERNEL" ubuntu-mini-iso/amd64/tree/casper/filesystem.kernel-generic
cp "$INITRD" ubuntu-mini-iso/amd64/tree/casper/filesystem.initrd-generic cp "$INITRD" ubuntu-mini-iso/amd64/tree/casper/filesystem.initrd-generic
APT_CONFIG_amd64=$(pwd)/apt.conf $BASEDIR/tools/boot/$SUITE/boot-amd64 1 $(readlink -f ubuntu-mini-iso/amd64/tree) APT_CONFIG_amd64=$(pwd)/apt.conf $BASEDIR/tools/boot/$LB_DISTRIBUTION/boot-amd64 1 $(readlink -f ubuntu-mini-iso/amd64/tree)
# Overwrite the grub.cfg that debian-cd generates by default # Overwrite the grub.cfg that debian-cd generates by default
cat > ubuntu-mini-iso/amd64/tree/boot/grub/grub.cfg <<EOF cat > ubuntu-mini-iso/amd64/tree/boot/grub/grub.cfg <<EOF
menuentry "Choose an Ubuntu version to install" { menuentry "Choose an Ubuntu version to install" {