diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-15 23:09:17 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-16 01:36:53 +0000 |
| commit | 2ea6eeefa2a42443b716436cdbffc26c6aca3392 (patch) | |
| tree | a6f93b8e26c6a788286d25f7128d4807cfdcc0d9 /scripts | |
| parent | 19e1a5b9c23e0954fe935c99c483fd104be608fb (diff) | |
| download | vyos-live-build-2ea6eeefa2a42443b716436cdbffc26c6aca3392.tar.gz vyos-live-build-2ea6eeefa2a42443b716436cdbffc26c6aca3392.zip | |
installer: move an exclude removal outside of loop
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 92a68a5da..b7d62bd8a 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -632,16 +632,13 @@ EOF # Excluding udebs from excludes because we want them to be in the image on purpose sed -i -e 's|di-utils-exit-installer||' exclude # used for live-installer-launcher + if [ "${LB_DEBIAN_INSTALLER}" = "live" ]; then + sed -i -e 's|live-installer||' exclude + fi # Remove all udebs to be excluded from inclusion - while read EXCLUDE - do - if [ "${LB_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ] - then - continue - fi - - rm -f ${EXCLUDE}_*.udeb + while read EXCLUDE; do + rm -f "${EXCLUDE}_*.udeb" done < exclude # Sort udebs into alphabetised pool structure |