From 7de5d67bf7474422113ae3206345e032c1239f05 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 18 Jan 2024 11:03:53 -0800 Subject: [PATCH] live-build/auto/config: don't repeatedly add the same pass name to the list of layers. --- debian/changelog | 7 +++++++ live-build/auto/config | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 36e7d1f8..ad689185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.04.19) UNRELEASED; urgency=medium + + * live-build/auto/config: don't repeatedly add the same pass name to the + list of layers. + + -- Steve Langasek Thu, 18 Jan 2024 11:02:55 -0800 + livecd-rootfs (24.04.18) noble; urgency=medium * update apparmor feature overlay match for target 6.6 kernel. diff --git a/live-build/auto/config b/live-build/auto/config index de3ca056..0f02d37f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -107,6 +107,12 @@ _register_pass () { # $1 Name of the pass [ "$PASSES_TO_LAYERS" != "true" ] && return + case "$PASSES" in + *$1*) + return + ;; + esac + # live-build/ubuntu/hooks/020-ubuntu-live.chroot_early assumes the # layer ending in '.live' is THE live layer to use, so ensure that # we only define a single layer ending in '.live'. It principle it