From e3355e29d8795bee873d404eb2e3ae2e1c4a2ab9 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Tue, 11 Feb 2025 08:27:16 -0700 Subject: [PATCH] ubuntu-server: default-layer.conf in casper pass default-layer.conf needs to be done in the casperization pass or we don't get that file. --- .../hooks/02-installer-bits.chroot_early | 4 ++++ .../hooks/03-kernel-metapkg.chroot_early | 17 ----------------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100755 live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early diff --git a/live-build/ubuntu-server/hooks/02-installer-bits.chroot_early b/live-build/ubuntu-server/hooks/02-installer-bits.chroot_early index 84a3486a..c659c8e3 100755 --- a/live-build/ubuntu-server/hooks/02-installer-bits.chroot_early +++ b/live-build/ubuntu-server/hooks/02-installer-bits.chroot_early @@ -15,3 +15,7 @@ esac cat < /etc/initramfs-tools/conf.d/casperize.conf export CASPER_GENERATE_UUID=1 EOF + +cat < /etc/initramfs-tools/conf.d/default-layer.conf +LAYERFS_PATH=${PASS}.squashfs +EOF diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early deleted file mode 100755 index 2c7a8878..00000000 --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -ex -# vi: ts=4 noexpandtab - -case $PASS in - ubuntu-server-minimal.ubuntu-server.installer.*.*) - exit 0 - ;; - ubuntu-server-minimal.ubuntu-server.installer.*) - ;; - *) - exit 0 - ;; -esac - -cat < /etc/initramfs-tools/conf.d/default-layer.conf -LAYERFS_PATH=${PASS}.squashfs -EOF