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

chroot_apt: fix broken removal

This commit is contained in:
Lyndon Brown 2020-04-04 20:20:07 +01:00 committed by Raphaël Hertzog
parent affcbb95d1
commit 1a0c813c46
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scripts/build/chroot_apt
View File

@ -173,11 +173,7 @@ case "${1}" in
CONFIG_FILE="config/apt/apt.conf"
CHROOT_FILE="chroot/etc/apt/apt.conf"
if [ -f ${CONFIG_FILE} ]; then
if [ -f ${CHROOT_FILE} ]; then
mv ${CHROOT_FILE} ${CHROOT_FILE}.orig
fi
cp ${CONFIG_FILE} ${CHROOT_FILE}
rm -f ${CHROOT_FILE}
if [ -f ${CHROOT_FILE}.orig ]; then
mv ${CHROOT_FILE}.orig ${CHROOT_FILE}
@ -188,25 +184,27 @@ case "${1}" in
CONFIG_FILE="config/apt/preferences"
CHROOT_FILE="chroot/etc/apt/preferences"
if [ -f ${CONFIG_FILE} ]; then
if [ -f ${CHROOT_FILE} ]; then
mv ${CHROOT_FILE} ${CHROOT_FILE}.orig
fi
cp ${CONFIG_FILE} ${CHROOT_FILE}
rm -f ${CHROOT_FILE}
if [ -f ${CHROOT_FILE}.orig ]; then
mv ${CHROOT_FILE}.orig ${CHROOT_FILE}
fi
elif [ -f ${CHROOT_FILE} ]; then
# delete additions from lb_chroot_apt install|install-binary to preferences
sed -i '/# Added by lb_chroot_apt/,$d' ${CHROOT_FILE}
# delete the last empty line
sed -i '${/^[[:blank:]]*$/d;}' ${CHROOT_FILE}
# if the resulting preferences file is empty, we must have created it, remove it
if [ ! -s ${CHROOT_FILE} ]; then
rm -f ${CHROOT_FILE}
fi
fi
if Find_files config/apt/*.pref; then
for CONFIG_FILE in config/apt/*.pref; do
CHROOT_FILE="chroot/etc/apt/preferences.d/$(basename ${CONFIG_FILE})"
if [ -f ${CHROOT_FILE} ]; then
mv ${CHROOT_FILE} ${CHROOT_FILE}.orig
fi
cp -aL ${CONFIG_FILE} chroot/etc/apt/preferences.d
rm -f ${CHROOT_FILE}
if [ -f ${CHROOT_FILE}.orig ]; then
mv ${CHROOT_FILE}.orig ${CHROOT_FILE}
@ -214,22 +212,6 @@ case "${1}" in
done
fi
if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
then
CHROOT_FILE="chroot/etc/apt/preferences"
if [ -f ${CHROOT_FILE} ]; then
# delete additions from lb_chroot_apt install|install-binary to preferences
sed -i '/# Added by lb_chroot_apt/,$d' ${CHROOT_FILE}
# delete the last empty line
sed -i '${/^[[:blank:]]*$/d;}' ${CHROOT_FILE}
# if the resulting preferences file is empty there was no user additions, remove it
if [ ! -s ${CHROOT_FILE} ]; then
rm -rf ${CHROOT_FILE}
fi
fi
fi
# Removing stage file
Remove_stagefile
;;