From 0bd8071d0292d42b66dcbd5cdccf1ea6022473e7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 24 Feb 2019 10:19:22 +0100
Subject: Removing staging repositories in debconf create script, not used
 anymore.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/debconf                | 34 ----------------------------------
 share/scripts/debconf.d/0003-debconf |  4 ++--
 2 files changed, 2 insertions(+), 36 deletions(-)

(limited to 'share/scripts')

diff --git a/share/scripts/debconf b/share/scripts/debconf
index fbb20fa..6fcf2af 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -466,26 +466,14 @@ Configure_system ()
 			for REPO in ${ARCHIVES}
 			do
 				case "${REPO}" in
-					${DIST}-staging)
-						echo "deb ${MIRROR} ${DIST}-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						;;
-
 					${DIST}-security)
 						echo "deb ${MIRROR_SECURITY} ${DIST}-security ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
 						;;
 
-					${DIST}-security-staging)
-						echo "deb ${MIRROR_SECURITY} ${DIST}-security-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						;;
-
 					${DIST}-updates)
 						echo "deb ${MIRROR} ${DIST}-updates ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
 						;;
 
-					${DIST}-updates-staging)
-						echo "deb ${MIRROR} ${DIST}-updates-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						;;
-
 					${DIST}-extras)
 						if echo "${AREA}" | grep -qs non-free
 						then
@@ -495,23 +483,10 @@ Configure_system ()
 						fi
 						;;
 
-					${DIST}-extras-staging)
-						if echo "${AREA}" | grep -qs non-free
-						then
-							echo "deb ${MIRROR} ${DIST}-extras-staging ${AREA} restricted" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						else
-							echo "deb ${MIRROR} ${DIST}-extras-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						fi
-						;;
-
 					${DIST}-backports)
 						echo "deb ${MIRROR} ${DIST}-backports ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
 						;;
 
-					${DIST}-backports-staging)
-						echo "deb ${MIRROR} ${DIST}-backports-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						;;
-
 					${DIST}-backports-extras)
 						if echo "${AREA}" | grep -qs non-free
 						then
@@ -520,15 +495,6 @@ Configure_system ()
 							echo "deb ${MIRROR} ${DIST}-backports-extras ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
 						fi
 						;;
-
-					${DIST}-backports-extras-staging)
-						if echo "${AREA}" | grep -qs non-free
-						then
-							echo "deb ${MIRROR} ${DIST}-backports-extras-staging ${AREA} restricted" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						else
-							echo "deb ${MIRROR} ${DIST}-backports-extras-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list"
-						fi
-						;;
 				esac
 			done
 			;;
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 843d0b4..c2d7897 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -229,8 +229,8 @@ Archives ()
 			progress-linux)
 				DIST="$(echo ${DISTRIBUTION} | sed -e 's|-backports||')"
 
-				db_subst container/archives CHOICES "staging, Security, Security (staging), Updates, Updates (staging), Extras, Extras (staging), Backports, Backports (staging), Backports Extras, Backports Extras (staging)"
-				db_subst container/archives CHOICES_C "${DIST}-staging, ${DIST}-security, ${DIST}-security-staging, ${DIST}-updates, ${DIST}-updates-staging, ${DIST}-extras, ${DIST}-extras-staging, ${DIST}-backports, ${DIST}-backports-staging, ${DIST}-backports-extras, ${DIST}-backports-extras-staging"
+				db_subst container/archives CHOICES "Security, Updates, Extras, Backports, Backports Extras"
+				db_subst container/archives CHOICES_C "${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras"
 
 				db_set container/archives "${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras"
 				db_fset container/archives seen false
-- 
cgit v1.2.3