diff options
| author | Roland Clobus <rclobus@rclobus.nl> | 2021-02-06 10:53:44 +0100 |
|---|---|---|
| committer | Roland Clobus <rclobus@rclobus.nl> | 2021-02-10 21:47:22 +0100 |
| commit | c9cf409e837005f119ce26558f1b8fb6ac65ed68 (patch) | |
| tree | 0bfa0aa613b4b6c2682ec6744917981f40b42650 /scripts | |
| parent | 01dc99e5280e70849b3960aa9f0843f94069e64d (diff) | |
| download | vyos-live-build-c9cf409e837005f119ce26558f1b8fb6ac65ed68.tar.gz vyos-live-build-c9cf409e837005f119ce26558f1b8fb6ac65ed68.zip | |
The local LIVE_BUILD wins over the system live-build for the list of udeb exclusions
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 4 |
1 files 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 |