From b8649c321ff103be6e93d947d10fb07f968a7088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 13 Apr 2023 09:45:04 +0200 Subject: [PATCH] Add default values to PASS in canary hooks. --- debian/changelog | 7 +++++++ 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, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 92eb2d53..b0c7fb55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.824) UNRELEASED; urgency=medium + + * Fix build failures of desktop raspi images due to canary hooks + interfering. + + -- Łukasz 'sil2100' Zemczak Thu, 13 Apr 2023 09:43:58 +0200 + livecd-rootfs (2.823) lunar; urgency=medium * Update infinite_scream URL to mastodon diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index 6bffc439..3c668b30 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -2,7 +2,7 @@ set -eux -case $PASS in +case ${PASS:-} in minimal.standard.enhanced-secureboot) ;; *) diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index 9c53b281..8c834d5b 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -2,7 +2,7 @@ set -eux -case $PASS in +case ${PASS:-} in minimal.standard.live) ;; *) diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-canary-live.chroot_early index 884b05b5..5bd741dd 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-canary-live.chroot_early @@ -2,7 +2,7 @@ set -eu -case $PASS in +case ${PASS:-} in minimal.standard.live) ;; *)