Disable the orphan_file ext4 feature in the canary live environment so that the installed system can be handled by the e2fsck in the extant kernel snap (cf. bug 2025339).

This commit is contained in:
Michael Hudson-Doyle 2023-07-04 12:11:56 +12:00
parent 7d0aa68826
commit b5387cb32b
2 changed files with 11 additions and 1 deletions

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ livecd-rootfs (2.896) UNRELEASED; urgency=medium
* live-build/ubuntu/hooks/033-disk-image-uefi.binary: update to point at
ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary, fixing canary
build.
* Disable the orphan_file ext4 feature in the canary live environment so
that the installed system can be handled by the e2fsck in the extant
kernel snap (cf. bug 2025339).
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 05 Jul 2023 10:12:21 +1200

View File

@ -10,7 +10,14 @@ case ${PASS:-} in
;;
esac
# TODO: Make sure this is only executed for canary builds
# TODO: Make sure this is only executed for canary builds (in a way
# other then relying on the fact that these hooks are only copied for
# an ubuntu:canary build)
# As described in LP: #2025339, an initrd built from a jammy userspace
# (which is what we use for canary builds currently) cannot fsck a
# mantic root filesystem created with the default options.
sed -i -e 's/,orphan_file//' /etc/mke2fs.conf
cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
export CASPER_GENERATE_UUID=1