Adding upstream version 20190301.upstream/20190301

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 14 insertions, 45 deletions

diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf
index 086fffc..9aca6bf 100755
--- a/share/scripts/debconf.d/0002-preseed-debconf
+++ b/share/scripts/debconf.d/0002-preseed-debconf
@@ -58,7 +58,7 @@ do
 	# preseed file has includes
 	INCLUDE_PRESEED_FILES="$(grep '^ *compute-tools *container/include-preseed-files' ${PRESEED_FILE} | awk '{ $1=$2=$3=""; print $0 }' | sed -e 's|,| |g')"
 
-	# FIXME: we're supporting only *ONE* include layer for now, so no nested/recursive includes just yet
+	# only one include layer is supported, no nested/recursive includes
 	for FILE in ${INCLUDE_PRESEED_FILES}
 	do
 		if [ -e "${FILE}" ]
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 843d0b4..684261a 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -118,20 +118,8 @@ Architecture ()
 
 		arm64)
 			DEFAULT="arm64"
-			CHOICES="Automatic, Rpi1 (armel), Rpi2 (armhf), Rpi3 (arm64)"
-			CHOICES_C="auto, armel, armhf, arm64"
-			;;
-
-		armel)
-			DEFAULT="armel"
-			CHOICES="Automatic, Rpi1 (armel)"
-			CHOICES_C="auto, armel"
-			;;
-
-		armhf)
-			DEFAULT="armhf"
-			CHOICES="Automatic, Rpi1 (armel), Rpi2 (armhf)"
-			CHOICES_C="auto, armel, armhf"
+			CHOICES="Automatic, RaspberryPi 3 (arm64)"
+			CHOICES_C="auto, arm64"
 			;;
 
 		i386)
@@ -195,29 +183,22 @@ Archives ()
 			debian)
 				case "${PARENT_DISTRIBUTION}" in
 					sid)
-						db_subst container/archives CHOICES "Experimental"
-						db_subst container/archives CHOICES_C "experimental"
+						db_subst container/archives CHOICES "sid, experimental"
 
-						db_set container/archives ""
+						db_set container/archives "sid"
 						db_fset container/archives seen false
 						;;
 
 					*)
-						db_subst container/archives CHOICES "Security, Updates, Backports, Proposed Updates"
-						db_subst container/archives CHOICES_C "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports, ${DISTRIBUTION}-proposed-updates"
+						db_subst container/archives CHOICES "${DISTRIBUTION}, ${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports, ${DISTRIBUTION}-proposed-updates"
 
 						case "${PARENT_DISTRIBUTION}" in
 							sid)
-								db_set container/archives ""
-								;;
-
-							buster)
-								db_set container/archives "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates"
+								db_set container/archives "sid"
 								;;
 
 							*)
-								#db_set container/archives "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports"
-								db_set container/archives "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates"
+								db_set container/archives "${DISTRIBUTION}, ${DISTRIBUTION}-security, ${DISTRIBUTION}-updates"
 								;;
 						esac
 
@@ -229,10 +210,9 @@ 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 "${DIST}, ${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_set container/archives "${DIST}, ${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras"
 				db_fset container/archives seen false
 				;;
 		esac
@@ -260,13 +240,11 @@ Parent_archives ()
 	then
 		case "${MODE}" in
 			progress-linux)
-				db_subst container/parent-archives CHOICES "Security, Updates, Backports, Proposed Updates"
-				db_subst container/parent-archives CHOICES_C "${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports, ${PARENT_DISTRIBUTION}-proposed-updates"
+				db_subst container/parent-archives CHOICES "${PARENT_DISTRIBUTION}, ${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports, ${PARENT_DISTRIBUTION}-proposed-updates"
 
 				case "${PARENT_DISTRIBUTION}" in
 					*)
-						#db_set container/parent-archives "${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports"
-						db_set container/parent-archives "${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates"
+						db_set container/parent-archives "${PARENT_DISTRIBUTION}, ${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates"
 						;;
 				esac
 
@@ -278,8 +256,7 @@ Parent_archives ()
 				;;
 
 			*)
-				db_subst container/parent-archives CHOICES "Security, Updates, Backports, Proposed Updates"
-				db_subst container/parent-archives CHOICES_C "${ARCHIVES}"
+				db_subst container/parent-archives CHOICES "${DISTRIBUTION}, ${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports, ${DISTRIBUTION}-proposed-updates"
 
 				db_set container/parent-archives "${ARCHIVES}"
 				db_fset container/parent-archives seen true
@@ -295,8 +272,7 @@ Parent_archives ()
 				progress-linux)
 					case "${PARENT_DISTRIBUTION}" in
 						*)
-							#PARENT_ARCHIVES="${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports"
-							PARENT_ARCHIVES="${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates"
+							PARENT_ARCHIVES="${PARENT_DISTRIBUTION}, ${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates"
 							;;
 					esac
 					;;
@@ -693,11 +669,6 @@ EOF
 
 Network_defaults ()
 {
-	# FIXME:
-	#   * use interfaces.d where possible
-	#   * respect pre-existing interfaces (or interfaces.d)
-	#   * add support for bridges (make interface configuration more generic?)
-
 	HOSTNAME_SHORT="$(echo veth-$(echo ${NAME} | cut -c-8)-0)"
 	VETH_NAME="${HOSTNAME_SHORT}"
 
diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates
index 3d607a7..13899ef 100644
--- a/share/scripts/debconf.d/0003-debconf.templates
+++ b/share/scripts/debconf.d/0003-debconf.templates
@@ -37,7 +37,6 @@ Description: Architecture
 Template: container/archives
 Type: multiselect
 Default:
-Choices-C: ${CHOICES_C}
 Choices: ${CHOICES}
 Description: Archives
  Archives.
@@ -45,7 +44,6 @@ Description: Archives
 Template: container/parent-archives
 Type: multiselect
 Default:
-Choices-C: ${CHOICES_C}
 Choices: ${CHOICES}
 Description: Parent Archives
  Parent Archives.