From 9d9a68d6bf638ceac5f11f432d72631ca96cdded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 18 Aug 2023 18:00:24 +0200 Subject: [PATCH] Fix the 020-canary-* hooks referencing the wrong layer names after changes introduced in 23.10.17. --- debian/changelog | 4 +++- live-build/ubuntu/hooks/020-canary-enhanced-sb.binary | 2 +- live-build/ubuntu/hooks/020-canary-live.binary | 2 +- live-build/ubuntu/hooks/020-canary-live.chroot_early | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4606f14f..3e3f8d7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ livecd-rootfs (23.10.18) UNRELEASED; urgency=medium snaps of the standard installation (including firefox), as we want to offer the same experience in the livefs as in the target installation. We also track other, proper channels for the seeded snaps. + * Fix the 020-canary-* hooks referencing the wrong layer names after changes + introduced in 23.10.17. - -- Łukasz 'sil2100' Zemczak Fri, 18 Aug 2023 17:49:09 +0200 + -- Łukasz 'sil2100' Zemczak Fri, 18 Aug 2023 17:58:54 +0200 livecd-rootfs (23.10.17) mantic; urgency=medium diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index edd5dab1..b14055d3 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -3,7 +3,7 @@ set -eux case ${PASS:-} in - minimal.standard.enhanced-secureboot) + standard.enhanced-secureboot) ;; *) exit 0 diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index fbced2b0..e8980ea0 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -3,7 +3,7 @@ set -eux case ${PASS:-} in - minimal.standard.live) + standard.live) ;; *) exit 0 diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-canary-live.chroot_early index 76846f3b..f5f165a5 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-canary-live.chroot_early @@ -3,7 +3,7 @@ set -eu case ${PASS:-} in - minimal.standard.live) + standard.live) ;; *) exit 0