From d460b9226cfe3aff5098960959e11351340228b8 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Sun, 14 May 2023 15:51:08 +0000 Subject: [PATCH] Imported 2.836 No reason for CPC update specified. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 26b503d8..0906c7d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.836) mantic; urgency=medium + + * canary: include cryptsetup in the live layer + + -- Dan Bungert Thu, 11 May 2023 19:16:18 -0600 + livecd-rootfs (2.835) mantic; urgency=medium * canary: fix the lookup location for 'enhanced-secureboot-desktop' diff --git a/live-build/auto/config b/live-build/auto/config index 5346c6a7..ff0abd60 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -757,7 +757,7 @@ case $PROJECT in fi # the live layer, contains all packages for the live session installer # TODO: we should probably add the kernel per KERNEL_FLAVOURS - add_package minimal.standard.live linux-generic casper lvm2 mdadm + add_package minimal.standard.live linux-generic casper lvm2 mdadm cryptsetup remove_package minimal.standard.live ubiquity-frontend-gtk # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install add_package minimal.standard.enhanced-secureboot cryptsetup