diff options
| author | Roland Clobus <rclobus@rclobus.nl> | 2021-01-24 22:54:57 +0100 |
|---|---|---|
| committer | Roland Clobus <rclobus@rclobus.nl> | 2021-02-10 21:47:20 +0100 |
| commit | 01dc99e5280e70849b3960aa9f0843f94069e64d (patch) | |
| tree | 633e93b61cd420c2b193711865d47a1f8d03dc52 | |
| parent | d6b7a54831fe0b7d87792688555c4417a3ec0902 (diff) | |
| download | vyos-live-build-01dc99e5280e70849b3960aa9f0843f94069e64d.tar.gz vyos-live-build-01dc99e5280e70849b3960aa9f0843f94069e64d.zip | |
The local LIVE_BUILD wins over the system live-build for the list of udeb inclusions. Only copy when the distribution is known
| -rwxr-xr-x | scripts/build/binary_disk | 4 |
1 files changed, 2 insertions, 2 deletions
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) |