From c9cf409e837005f119ce26558f1b8fb6ac65ed68 Mon Sep 17 00:00:00 2001 From: Roland Clobus Date: Sat, 6 Feb 2021 10:53:44 +0100 Subject: [PATCH] The local LIVE_BUILD wins over the system live-build for the list of udeb exclusions --- scripts/build/installer_debian-installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 6d27ccdf4..98440c75e 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -615,9 +615,9 @@ EOF Echo_debug "Generating exclude list" # Excluding udebs - for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd + for LOCATION in /usr/share/live/build/data/debian-cd "${LIVE_BUILD}/data/debian-cd" do - if [ -e "${LOCATION}" ] + if [ -e "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" ] then grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true