From 2a36fbce0ba3e69d5f5bd8e69c90654cd1b3d83a Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 5 Aug 2017 12:23:12 -0400
Subject: chroot-installs: drop jobs with upgrade apt-dpkg first (and add them
 to the zombie check)

Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 bin/chroot-installation.sh | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'bin/chroot-installation.sh')

diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index f86febed..76d61276 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -137,18 +137,11 @@ echo "set +x" >> $CTMPFILE
 }
 
 prepare_upgrade2() {
-	# support _aptdpkg_first type upgrade jobs...
-	if [ "${JOB_NAME: -14}" = "_aptdpkg_first" ] ; then
-		APTDPKGFIRST="apt-get -y install dpkg apt"
-	else
-		APTDPKGFIRST=""
-	fi
 	cat >> $CTMPFILE <<-EOF
 echo "deb $MIRROR $1 main" > /etc/apt/sources.list.d/$1.list
 $SCRIPT_HEADER
 set -x
 apt-get update
-$APTDPKGFIRST
 apt-get -y upgrade
 apt-get clean
 apt-get -yf dist-upgrade
-- 
cgit v1.2.3-54-g00ecf