Adding upstream version 20161101.upstream/20161101

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 10 insertions, 46 deletions

diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 548fb07..c0944fa 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -35,15 +35,15 @@ Distribution ()
 				db_subst cnt-debconf/distribution CHOICES "Debian GNU/Linux 8 \"jessie\", Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux unstable/sid"
 				db_subst cnt-debconf/distribution CHOICES_C "jessie, stretch, sid"
 
-				db_set cnt-debconf/distribution jessie
+				db_set cnt-debconf/distribution stretch
 				db_fset cnt-debconf/distribution seen false
 				;;
 
 			progress-linux)
-				db_subst cnt-debconf/distribution CHOICES "Progress Linux 3 (cairon), Progress Linux 3+ (cairon-backports)"
-				db_subst cnt-debconf/distribution CHOICES_C "cairon, cairon-backports"
+				db_subst cnt-debconf/distribution CHOICES "Progress Linux 4 (dschinn), Progress Linux 4+ (dschinn-backports)"
+				db_subst cnt-debconf/distribution CHOICES_C "dschinn, dschinn-backports"
 
-				db_set cnt-debconf/distribution cairon-backports
+				db_set cnt-debconf/distribution dschinn-backports
 				db_fset cnt-debconf/distribution seen false
 				;;
 		esac
@@ -70,8 +70,8 @@ Parent_distribution ()
 		case "${MODE}" in
 			progress-linux)
 				case "${DISTRIBUTION}" in
-					cairon*)
-						PARENT_DISTRIBUTION="jessie"
+					dschinn*)
+						PARENT_DISTRIBUTION="stretch"
 						;;
 				esac
 				;;
@@ -298,7 +298,7 @@ Mirror ()
 	then
 		case "${MODE}" in
 			debian)
-				db_set cnt-debconf/mirror http://ftp.debian.org/debian
+				db_set cnt-debconf/mirror https://deb.debian.org/debian
 				db_fset cnt-debconf/mirror seen false
 				;;
 
@@ -319,7 +319,7 @@ Mirror ()
 		then
 			case "${MODE}" in
 				debian)
-					MIRROR="http://ftp.debian.org/debian"
+					MIRROR="https://deb.debian.org/debian"
 					;;
 
 				progress-linux)
@@ -391,7 +391,7 @@ Parent_mirror ()
 	then
 		case "${MODE}" in
 			progress-linux)
-				db_set cnt-debconf/parent-mirror http://ftp.debian.org/debian
+				db_set cnt-debconf/parent-mirror https://deb.debian.org/debian
 				db_fset cnt-debconf/parent-mirror seen false
 
 				db_settitle cnt-debconf/title
@@ -412,7 +412,7 @@ Parent_mirror ()
 		then
 			case "${MODE}" in
 				progress-linux)
-					PARENT_MIRROR="http://ftp.debian.org/debian"
+					PARENT_MIRROR="https://deb.debian.org/debian"
 					;;
 
 				*)
@@ -711,18 +711,12 @@ Network ()
 	db_get cnt-debconf/network0/ipv4-address
 	NETWORK0_IPV4_ADDRESS="${RET}" # string (w/o empty)
 
-	db_get cnt-debconf/network0/ipv4-broadcast
-	NETWORK0_IPV4_BROADCAST="${RET}" # string (w/ empty)
-
 	db_get cnt-debconf/network0/ipv4-gateway
 	NETWORK0_IPV4_GATEWAY="${RET}" # string (w/ empty)
 
 	db_get cnt-debconf/network0/ipv4-netmask
 	NETWORK0_IPV4_NETMASK="${RET}" # string (w/o empty)
 
-	db_get cnt-debconf/network0/ipv4-network
-	NETWORK0_IPV4_NETWORK="${RET}" # string (w/ empty)
-
 	db_get cnt-debconf/network0/ipv4-post-up
 	NETWORK0_IPV4_POST_UP="${RET}" # string (w/ empty)
 
@@ -758,18 +752,12 @@ Network ()
 	db_set cnt-debconf/network0/ipv4-address "${NETWORK0_IPV4_ADDRESS}"
 	db_fset cnt-debconf/network0/ipv4-address seen false
 
-	db_set cnt-debconf/network0/ipv4-broadcast "${NETWORK0_IPV4_BROADCAST}"
-	db_fset cnt-debconf/network0/ipv4-broadcast seen false
-
 	db_set cnt-debconf/network0/ipv4-gateway "${NETWORK0_IPV4_GATEWAY}"
 	db_fset cnt-debconf/network0/ipv4-gateway seen false
 
 	db_set cnt-debconf/network0/ipv4-netmask "${NETWORK0_IPV4_NETMASK}"
 	db_fset cnt-debconf/network0/ipv4-netmask seen false
 
-	db_set cnt-debconf/network0/ipv4-network "${NETWORK0_IPV4_NETWORK}"
-	db_fset cnt-debconf/network0/ipv4-network seen false
-
 	db_set cnt-debconf/network0/ipv4-post-up "${NETWORK0_IPV4_POST_UP}"
 	db_fset cnt-debconf/network0/ipv4-post-up seen false
 
@@ -815,10 +803,6 @@ Network ()
 			db_go
 
 			db_settitle cnt-debconf/title
-			db_input high cnt-debconf/network0/ipv4-broadcast || true
-			db_go
-
-			db_settitle cnt-debconf/title
 			db_input high cnt-debconf/network0/ipv4-gateway || true
 			db_go
 
@@ -827,10 +811,6 @@ Network ()
 			db_go
 
 			db_settitle cnt-debconf/title
-			db_input high cnt-debconf/network0/ipv4-network || true
-			db_go
-
-			db_settitle cnt-debconf/title
 			db_input high cnt-debconf/network0/ipv4-post-up || true
 			db_go
 
@@ -873,11 +853,6 @@ Network ()
 			eval NETWORK${NUMBER}_IPV4_ADDRESS="\"${RET}\"" # string (w/o empty)
 		fi
 
-		if db_get cnt-debconf/network${NUMBER}/ipv4-broadcast
-		then
-			eval NETWORK${NUMBER}_IPV4_BROADCAST="\"${RET}\"" # string (w/ empty)
-		fi
-
 		if db_get cnt-debconf/network${NUMBER}/ipv4-gateway
 		then
 			eval NETWORK${NUMBER}_IPV4_GATEWAY="\"${RET}\"" # string (w/ empty)
@@ -888,11 +863,6 @@ Network ()
 			eval NETWORK${NUMBER}_IPV4_NETMASK="\"${RET}\"" # string (w/o empty)
 		fi
 
-		if db_get cnt-debconf/network${NUMBER}/ipv4-network
-		then
-			eval NETWORK${NUMBER}_IPV4_NETWORK="\"${RET}\"" # string (w/ empty)
-		fi
-
 		if db_get cnt-debconf/network${NUMBER}/ipv4-post-up
 		then
 			eval NETWORK${NUMBER}_IPV4_POST_UP="\"${RET}\"" # string (w/ empty)
@@ -941,18 +911,12 @@ Network ()
 		eval ADDRESS="$`echo NETWORK${NUMBER}_IPV4_ADDRESS`"
 		echo "NETWORK${NUMBER}_IPV4_ADDRESS=\"${ADDRESS}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
-		eval BROADCAST="$`echo NETWORK${NUMBER}_IPV4_BROADCAST`"
-		echo "NETWORK${NUMBER}_IPV4_BROADCAST=\"${BROADCAST}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
-
 		eval GATEWAY="$`echo NETWORK${NUMBER}_IPV4_GATEWAY`"
 		echo "NETWORK${NUMBER}_IPV4_GATEWAY=\"${GATEWAY}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
 		eval NETMASK="$`echo NETWORK${NUMBER}_IPV4_NETMASK`"
 		echo "NETWORK${NUMBER}_IPV4_NETMASK=\"${NETMASK}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
-		eval NETWORK="$`echo NETWORK${NUMBER}_IPV4_NETWORK`"
-		echo "NETWORK${NUMBER}_IPV4_NETWORK=\"${NETWORK}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
-
 		eval POST_UP="$`echo NETWORK${NUMBER}_IPV4_POST_UP`"
 		echo "NETWORK${NUMBER}_IPV4_POST_UP=\"${POST_UP}\"" >> "${DEBCONF_TMPDIR}/debconf.default"