From 11f1a1dc8437428540f069a1af7caf3b3c4fdd06 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 12 Feb 2025 09:52:42 +1300 Subject: [PATCH] live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary: Drop the assumption that the uncompressed part of the initrd is unpacked to a directory called "main". --- debian/changelog | 6 ++++++ live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f5b5827..24bdf41e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ livecd-rootfs (25.04.17) UNRELEASED; urgency=medium + [ Dan Bungert ] * Fix build failure when using lowlatency-hwe-24.04, as ubuntustudio does. (LP: #2098105) + [ Michael Hudson-Doyle ] + * live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary: Drop the + assumption that the uncompressed part of the initrd is unpacked to a + directory called "main". + -- Dan Bungert Thu, 13 Feb 2025 13:10:24 -0700 livecd-rootfs (25.04.16) plucky; urgency=medium diff --git a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary index 415b2fc8..2db1be10 100755 --- a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary +++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary @@ -46,15 +46,15 @@ touch ubuntu-mini-iso/$ARCH/tree/.disk/base_installable tmpdir=$(mktemp -d) unmkinitramfs $INITRD $tmpdir -if [ -e "$tmpdir/main/conf/uuid.conf" ]; then - uuid_conf="$tmpdir/main/conf/uuid.conf" +if [ -e $tmpdir/*/conf/uuid.conf ]; then + uuid_conf=$tmpdir/*/conf/uuid.conf elif [ -e "$tmpdir/conf/uuid.conf" ]; then uuid_conf="$tmpdir/conf/uuid.conf" else echo "uuid.conf not found" exit 1 fi -cp "$uuid_conf" ubuntu-mini-iso/$ARCH/tree/.disk/casper-uuid-generic +cp $uuid_conf ubuntu-mini-iso/$ARCH/tree/.disk/casper-uuid-generic rm -fr $tmpdir cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type <