From d7b629cae6048bf30fd8bfd241a0b1c23aac9b7b Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 5 Jun 2019 13:50:20 +0100 Subject: [PATCH] Do not force lzma on ubuntu-core builds, the compress format default should be set universally inside initramfs-tools-ubuntu-core package instead of getting duplicated multiple times all over the place. --- debian/changelog | 3 +++ live-build/auto/build | 2 -- live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3911820b..333dd481 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ livecd-rootfs (2.592) UNRELEASED; urgency=medium * Drop trying to mount removed maas squashfs. * Stop overriding initramfs compression default to lzma. LP: #1831736 + * Do not force lzma on ubuntu-core builds, the compress format default + should be set universally inside initramfs-tools-ubuntu-core package + instead of getting duplicated multiple times all over the place. -- Dimitri John Ledkov Wed, 05 Jun 2019 00:02:32 +0100 diff --git a/live-build/auto/build b/live-build/auto/build index fa3467c5..e27491cf 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -590,8 +590,6 @@ case $PROJECT:${SUBPROJECT:-} in Chroot chroot "apt-get -y autoremove" rm -rf chroot/boot/initrd.img* chroot/boot/vmlinu?-* chroot/lib/modules/* \ chroot/boot/abi-* chroot/boot/System.map-* chroot/boot/config-* - mkdir -p chroot/etc/initramfs-tools/conf.d - echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/snappy-device-tarball.conf # install needed packages and the kernel itself Chroot chroot "apt-get -y install initramfs-tools-ubuntu-core linux-firmware xz-utils" diff --git a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot index c967bc7c..c9d95c0a 100755 --- a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot +++ b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot @@ -8,10 +8,6 @@ IVER="$(dpkg -s initramfs-tools-ubuntu-core | \ # fail the build if we did not find the snappy initrd package [ -n "$IVER" ] || exit 1 -# force lzma -mkdir -p /etc/initramfs-tools/conf.d -echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf - update-initramfs.REAL -c -kcore-$IVER -v cd /boot