From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 23 Jan 2019 08:50:56 +0000 (+0100)
Subject: setup-dchroot: do install of security and updates for ubuntu chroots earlier
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6b10b178e4fa7414a3ae9cb0e09c045c079920b6;p=mirror%2Fdsa-puppet.git

setup-dchroot: do install of security and updates for ubuntu chroots earlier
---

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 2d5592006..dc2ad44f7 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -397,15 +397,17 @@ while true; do
 done
 EOF
 chmod +x "$rootdir/usr/local/sbin/policy-rc.d"
-[ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
-chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
-[ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
+
 if [ -n "$ubuntu" ]; then
   echo "deb $mirror ${suite}-updates main" >> "$rootdir/etc/apt/sources.list"
   echo "deb $mirror ${suite}-security main" >> "$rootdir/etc/apt/sources.list"
   chroot "$rootdir" apt-get update
   chroot "$rootdir" apt-get dist-upgrade -y
 fi
+
+[ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
+chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
+[ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
 rm -f "$rootdir/etc/apt/sources.list" "$rootdir/etc/apt/sources.list.d/*"
 chroot "$rootdir" apt-get clean
 umount "$rootdir/dev" 2>/dev/null || true