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

Fix unconditional overwriting of /etc/apt/preferences.d/progress.pref in progress mode.

This commit is contained in:
Daniel Baumann 2012-01-07 19:48:32 +01:00
parent ac004b56d2
commit e3c9db7a2b
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
scripts/build/lb_chroot_apt
View File

@ -148,29 +148,31 @@ case "${1}" in
case "${LB_MODE}" in
progress)
echo "# /etc/apt/preferences.d/progress.pref" > chroot/etc/apt/preferences.d/progress.pref
case "${LB_DISTRIBUTION}" in
*-backports)
_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
;;
*)
_DISTRIBUTIONS="${LB_DISTRIBUTION}"
;;
esac
if [ "${LB_SECURITY}" = "true" ]
if [ ! -e chroot/etc/apt/preferences.d/progress.pref ]
then
echo "# /etc/apt/preferences.d/progress.pref" > chroot/etc/apt/preferences.d/progress.pref
case "${LB_DISTRIBUTION}" in
artax)
_DISTRIBUTION="${_DISTRIBUTION} ${LB_DISTRIBUTION}-security"
*-backports)
_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
;;
*)
_DISTRIBUTIONS="${LB_DISTRIBUTION}"
;;
esac
fi
for _DISTRIBUTION in ${_DISTRIBUTIONS}
do
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_DISTRIBUTION}" in
artax)
_DISTRIBUTION="${_DISTRIBUTION} ${LB_DISTRIBUTION}-security"
;;
esac
fi
for _DISTRIBUTION in ${_DISTRIBUTIONS}
do
cat >> chroot/etc/apt/preferences.d/progress.pref << EOF
@ -179,7 +181,8 @@ Pin: release n=${_DISTRIBUTION}
Pin-Priority: 999
EOF
done
done
fi
;;
esac