manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

installer: No error if the udeb-exclusion list is empty

This commit is contained in:
Roland Clobus 2023-01-14 20:12:07 +01:00 committed by Luca Boccassi
parent 2acfbee5fd
commit 947f6aafe8
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/build/installer_debian-installer
View File

@ -711,17 +711,22 @@ EOF
cat ../config/debian-installer/udeb_exclude >> exclude
fi
# 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
if [ -e exclude ]
then
# 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
Echo_debug "Removing excluded udebs"
while read EXCLUDE; do
done < exclude
rm -f ${EXCLUDE}_*.udeb
# Remove all udebs to be excluded from inclusion
Echo_debug "Removing excluded udebs"
while read EXCLUDE; do
rm -f ${EXCLUDE}_*.udeb
done < exclude
else
Echo_message "No udeb-exclusion list used"
fi
# Sort udebs into alphabetised pool structure
Echo_debug "Organising into pool structure"