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".

This commit is contained in:
Michael Hudson-Doyle 2025-02-12 09:52:42 +13:00
parent 9930bcd9b4
commit 11f1a1dc84
2 changed files with 9 additions and 3 deletions

6
debian/changelog vendored
View File

@ -1,8 +1,14 @@
livecd-rootfs (25.04.17) UNRELEASED; urgency=medium livecd-rootfs (25.04.17) UNRELEASED; urgency=medium
[ Dan Bungert ]
* Fix build failure when using lowlatency-hwe-24.04, as ubuntustudio does. * Fix build failure when using lowlatency-hwe-24.04, as ubuntustudio does.
(LP: #2098105) (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 <daniel.bungert@canonical.com> Thu, 13 Feb 2025 13:10:24 -0700 -- Dan Bungert <daniel.bungert@canonical.com> Thu, 13 Feb 2025 13:10:24 -0700
livecd-rootfs (25.04.16) plucky; urgency=medium livecd-rootfs (25.04.16) plucky; urgency=medium

View File

@ -46,15 +46,15 @@ touch ubuntu-mini-iso/$ARCH/tree/.disk/base_installable
tmpdir=$(mktemp -d) tmpdir=$(mktemp -d)
unmkinitramfs $INITRD $tmpdir unmkinitramfs $INITRD $tmpdir
if [ -e "$tmpdir/main/conf/uuid.conf" ]; then if [ -e $tmpdir/*/conf/uuid.conf ]; then
uuid_conf="$tmpdir/main/conf/uuid.conf" uuid_conf=$tmpdir/*/conf/uuid.conf
elif [ -e "$tmpdir/conf/uuid.conf" ]; then elif [ -e "$tmpdir/conf/uuid.conf" ]; then
uuid_conf="$tmpdir/conf/uuid.conf" uuid_conf="$tmpdir/conf/uuid.conf"
else else
echo "uuid.conf not found" echo "uuid.conf not found"
exit 1 exit 1
fi 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 rm -fr $tmpdir
cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type <<EOF cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type <<EOF