summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-01-07 19:54:56 +0100
committerDaniel Baumann <daniel@debian.org>2012-01-07 19:59:55 +0100
commite05fa004ff097261735253995ec543e71c229004 (patch)
tree01f72dc149441c32d38f2442b3529ba00862a1e2
parente3c9db7a2ba4f9a53f95dd5a2095d3085dfc055c (diff)
downloadvyos-live-build-e05fa004ff097261735253995ec543e71c229004.tar.gz
vyos-live-build-e05fa004ff097261735253995ec543e71c229004.zip
Correcting assembling of automatic pinning in progress mode.
-rwxr-xr-xscripts/build/lb_chroot_apt26
1 files changed, 12 insertions, 14 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 565cb0a64..cf92c3811 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -152,23 +152,21 @@ case "${1}" in
then
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
+ _DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')"
if [ "${LB_SECURITY}" = "true" ]
then
- case "${LB_DISTRIBUTION}" in
- artax)
- _DISTRIBUTION="${_DISTRIBUTION} ${LB_DISTRIBUTION}-security"
- ;;
- esac
+ _DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-security"
+ fi
+
+ if [ "${LB_VOLATILE}" = "true" ]
+ then
+ _DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-updates"
+ fi
+
+ if [ "${LB_BACKPORTS}" = "true" ]
+ then
+ _DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-backports"
fi
for _DISTRIBUTION in ${_DISTRIBUTIONS}