From 41fbfd6bb6f62ccf58637b4d8cfdaa98834e6d82 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Mon, 18 Sep 2023 09:14:14 -0600 Subject: [PATCH] desktop: construct minimal+tpmfde variation --- live-build/auto/config | 12 ++++++++++++ .../ubuntu/hooks/020-ubuntu-enhanced-sb.binary | 2 ++ 2 files changed, 14 insertions(+) diff --git a/live-build/auto/config b/live-build/auto/config index dc2a3c35..20d28139 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -727,12 +727,14 @@ case $PROJECT in add_snap minimal.standard.live ubuntu-desktop-installer/classic add_package minimal.standard.live linux-generic-hwe-22.04 casper # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install + add_package minimal.enhanced-secureboot cryptsetup boot-managed-by-snapd add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd # language support seeded_langs="$(get_seeded_languages desktop)" echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" + derive_language_layers minimal.enhanced-secureboot desktop-minimal desktop-default-languages "$seeded_langs" derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs" @@ -746,6 +748,16 @@ case $PROJECT in default: yes variant: desktop locale_support: langpack + variations: + minimal: + path: minimal.squashfs + EOF + cat <<-EOF > config/minimal.enhanced-secureboot.catalog-in.yaml + id: ubuntu-desktop-minimal + variations: + minimal-enhanced-secureboot: + path: minimal.enhanced-secureboot.squashfs + snapd_system_label: enhanced-secureboot-desktop EOF cat <<-EOF > config/minimal.standard.catalog-in.yaml name: "Ubuntu Desktop" diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary index 3f645ba4..1fcd2b42 100644 --- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary @@ -5,6 +5,8 @@ set -eux case ${PASS:-} in minimal.standard.enhanced-secureboot) ;; + minimal.enhanced-secureboot) + ;; *) exit 0 ;;