From 01dc99e5280e70849b3960aa9f0843f94069e64d Mon Sep 17 00:00:00 2001 From: Roland Clobus Date: Sun, 24 Jan 2021 22:54:57 +0100 Subject: The local LIVE_BUILD wins over the system live-build for the list of udeb inclusions. Only copy when the distribution is known --- scripts/build/binary_disk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 21092cab9..5cecd9b55 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -131,9 +131,9 @@ case "${LB_DEBIAN_INSTALLER}" in esac #FIXME review the netboot case -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_DISTRIBUTION_BINARY}" ] then case "${LB_DEBIAN_INSTALLER}" in cdrom) -- cgit v1.2.3