From 21333e988960ba2ad3f88d6813dcd039234d4137 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 26 Aug 2023 15:12:09 -0700 Subject: [PATCH] Drop mke2fs.conf override, no longer needed. --- debian/changelog | 1 + live-build/ubuntu/hooks/020-canary-live.chroot_early | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d90bead..ac37a146 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ livecd-rootfs (23.10.23) UNRELEASED; urgency=medium session, and not the squashfs layer used as the source for installation. split the chroot hooks to add this to the standard.squashfs. LP: #2033170. + * Drop mke2fs.conf override, no longer needed. -- Steve Langasek Sat, 26 Aug 2023 15:05:13 -0700 diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-canary-live.chroot_early index 96b316bb..b300b228 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-canary-live.chroot_early @@ -14,11 +14,6 @@ esac # 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 < /etc/initramfs-tools/conf.d/casperize.conf export CASPER_GENERATE_UUID=1 EOF