Merging upstream version 20221023.

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

6 files changed, 215 insertions, 35 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 94e6755..ba5972a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+2022-10-23	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20221023.
+
+	[ Daniel Baumann ]
+	* Removing curl pre-http2 option handling.
+	* Renaming internal bootstrap function to be more generic in debconf build-script.
+	* Adding initial image support in container debconf build-scripts.
+
 2022-10-15	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20221015.
diff --git a/VERSION.txt b/VERSION.txt
index 88e8f3f..e09d253 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20221015
+20221023
diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index 36482a3..900242d 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -22,6 +22,7 @@ set -e
 PROJECT="open-infrastructure"
 SOFTWARE="compute-tools"
 PROGRAM="container"
+VERSION="$(container version)"
 
 SCRIPT="${0}"
 export SCRIPT
@@ -116,17 +117,6 @@ then
 	exit 1
 fi
 
-if [ -x /usr/bin/mmdebstrap ]
-then
-	BOOTSTRAP="mmdebstrap"
-elif [ -x /usr/sbin/debootstrap ]
-then
-	BOOTSTRAP="debootstrap"
-else
-	echo "'${NAME}': /usr/bin/mmdebstrap or /usr/sbin/debootstrap - no such file." >&2
-	exit 1
-fi
-
 if [ "$(id -u)" -ne 0 ]
 then
 	echo "'${NAME}': need root privileges" >&2
@@ -373,7 +363,7 @@ EOF
 	export DEBCONF_SYSTEMRC
 }
 
-Debootstrap ()
+Bootstrap ()
 {
 	DIRECTORY="${1}"
 
@@ -416,6 +406,83 @@ Debootstrap ()
 	esac
 }
 
+Image ()
+{
+	DIRECTORY="${1}"
+
+	FILES="${IMAGE}"
+
+	for NUMBER in $(seq 1 ${IMAGE_NUMBER})
+	do
+		eval FILES="${FILES} $`echo IMAGE${NUMBER}`"
+	done
+
+	for FILE in ${FILES}
+	do
+		case "${FILE}" in
+			*.gz)
+				TAR_OPTIONS="--gzip"
+
+				if [ ! -e /bin/gzip ]
+				then
+					echo -en "\n"
+					echo "'${NAME}': /bin/lzip - no such file." >&2
+					exit 1
+				fi
+				;;
+
+			*.lz)
+				TAR_OPTIONS="--lzip"
+
+				if [ ! -e /usr/bin/lzip ]
+				then
+					echo -en "\n"
+					echo "'${NAME}': /usr/bin/lzip - no such file." >&2
+					exit 1
+				fi
+			;;
+
+			*.xz)
+				TAR_OPTIONS="--xz"
+
+				if [ ! -e /usr/bin/xz ]
+				then
+					echo -en "\n"
+					echo "'${NAME}': /usr/bin/xz - no such file." >&2
+					exit 1
+				fi
+				;;
+
+			*)
+				TAR_OPTIONS=""
+				;;
+		esac
+
+		mkdir -p "${DIRECTORY}"
+
+		echo "Using ${FILE}"
+
+		if [ -e /usr/bin/pv ]
+		then
+			curl	--fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} --http2 ${CURL_TIME_COND} \
+				"${FILE}" -o - | \
+				pv --format '%p' --width 77 | \
+				tar -C "${DIRECTORY}" --strip 1 ${TAR_OPTIONS} -xf -
+				#pv --format '%p' --width 77 "${CACHE}/${FILE}" | tar xf - ${TAR_OPTIONS} -C "${DIRECTORY}" --strip 1
+		else
+			curl	--fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} --http2 ${CURL_TIME_COND} \
+				"${FILE}" -o - | \
+				tar -C "${DIRECTORY}" --strip 1 ${TAR_OPTIONS} -xf -
+		fi
+
+		echo " ok."
+	done
+
+	# Writing resolv.conf
+	rm -f "${DIRECTORY}/etc/resolv.conf"
+	cp /etc/resolv.conf "${DIRECTORY}/etc"
+}
+
 Configure_apt ()
 {
 	DIRECTORY="${1}"
@@ -445,7 +512,11 @@ EOF
 
 			rm -f "${DIRECTORY}/progress-linux.cfg"
 
-			Chroot "${DIRECTORY}" "apt update"
+			case "${INSTALLER}" in
+				bootstrap)
+					Chroot "${DIRECTORY}" "apt update"
+					;;
+			esac
 			;;
 	esac
 }
@@ -1140,22 +1211,89 @@ done
 
 SYSTEM="${MACHINES}/${NAME}"
 
-## Generic parts
-if [ ! -e "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" ]
+if [ -z "${IMAGE}" ] && [ -z "${IMAGE1}" ]
 then
-	Debootstrap "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp"
-	Configure_apt "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp"
-	Deconfigure_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp"
-
-	mv "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp" "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}"
+	INSTALLER="bootstrap"
+else
+	INSTALLER="image"
 fi
 
-Upgrade_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" || echo "W: If upgrading the system failed, try removing the cache for your distribution in /var/cache/${PROGRAM}"
-Cleanup_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}"
+case "${INSTALLER}" in
+	bootstrap)
+		## Dependencies
+		if [ -x /usr/bin/mmdebstrap ]
+		then
+			BOOTSTRAP="mmdebstrap"
+		elif [ -x /usr/sbin/debootstrap ]
+		then
+			BOOTSTRAP="debootstrap"
+		else
+			echo "'${NAME}': /usr/bin/mmdebstrap or /usr/sbin/debootstrap - no such file." >&2
+			exit 1
+		fi
+
+		## Generic parts
+		if [ ! -e "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" ]
+		then
+			Bootstrap "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp"
+			Configure_apt "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp"
+			Deconfigure_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp"
+
+			mv "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}.tmp" "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}"
+		fi
+
+		Upgrade_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" || echo "W: If upgrading the system failed, try removing the cache for your distribution in /var/cache/${PROGRAM}"
+		Cleanup_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}"
+
+		## Specific parts
+		mkdir -p "${MACHINES}"
+		cp -a "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" "${MACHINES}/${NAME}"
+		;;
+
+	image)
+		## Dependencies
+		if [ -x /usr/bin/curl ]
+		then
+			GET="curl"
+		elif [ -x /usr/bin/wget ]
+		then
+			GET="wget"
+		else
+			echo "'${NAME}': /usr/bin/curl or /usr/bin/wget - no such file." >&2
+			exit 1
+		fi
+
+		COMPRESSIONS=""
+
+		if [ -x /usr/bin/lzip ]
+		then
+			COMPRESSIONS="${COMPRESSIONS} lz"
+		fi
+
+		if [ -x /usr/bin/xz ]
+		then
+			COMPRESSIONS="${COMPRESSIONS} xz"
+		fi
+
+		if [ -x /bin/gzip ]
+		then
+			COMPRESSIONS="${COMPRESSIONS} gz"
+		fi
+
+		if [ -z "${COMPRESSIONS}" ]
+		then
+			echo "'${NAME}': no supported compressor available (lz, xz, gz)."
+			exit 1
+		fi
+
+		## Parts
+		mkdir -p "${MACHINES}"
+		Image "${MACHINES}/${NAME}"
 
-## Specific parts
-mkdir -p "${MACHINES}"
-cp -a "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" "${MACHINES}/${NAME}"
+		Configure_apt "${MACHINES}/${NAME}"
+		Deconfigure_system "${MACHINES}/${NAME}"
+		;;
+esac
 
 Mount
 
diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf
index edd3ea7..c5b5778 100755
--- a/share/build-scripts/debconf.d/0003-debconf
+++ b/share/build-scripts/debconf.d/0003-debconf
@@ -44,6 +44,39 @@ Mode ()
 	export MODE
 }
 
+Images ()
+{
+	if db_get container/image && [ "${RET}" ]
+	then
+		db_get container/image
+		IMAGE="${RET}" # string (w/o empty)
+
+		echo "IMAGE=\"${IMAGE}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+	fi
+
+	NUMBER="1"
+
+	while db_get container/image${NUMBER} && [ "${RET}" ]
+	do
+		if db_get container/image${NUMBER}
+		then
+			eval IMAGE${NUMBER}="\"${RET}\"" # string (w/o empty)
+		fi
+
+		NUMBER="$((${NUMBER} + 1))"
+	done
+
+	IMAGE_NUMBER="$((${NUMBER} - 1))"
+
+	echo "IMAGE_NUMBER=\"${IMAGE_NUMBER}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+
+	for NUMBER in $(seq 1 ${IMAGE_NUMBER})
+	do
+		eval IMAGE="$`echo IMAGE${NUMBER}`"
+		echo "IMAGE${NUMBER}=\"${IMAGE}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+	done
+}
+
 Distribution ()
 {
 	db_get container/distribution
@@ -1284,6 +1317,7 @@ Internal_options ()
 }
 
 Mode
+Images
 
 Distribution
 Parent_distribution
diff --git a/share/build-scripts/debconf.d/0003-debconf.templates b/share/build-scripts/debconf.d/0003-debconf.templates
index 098acd1..551033a 100644
--- a/share/build-scripts/debconf.d/0003-debconf.templates
+++ b/share/build-scripts/debconf.d/0003-debconf.templates
@@ -10,6 +10,12 @@ Choices: ${CHOICES}
 Description: Mode
  Mode.
 
+Template: container/image
+Type: string
+Default:
+Description: Image
+ Image.
+
 Template: container/distribution
 Type: select
 Default:
diff --git a/share/get-scripts/curl b/share/get-scripts/curl
index 2dce4cf..00a8d73 100755
--- a/share/get-scripts/curl
+++ b/share/get-scripts/curl
@@ -231,13 +231,6 @@ done
 
 # FIXME: default server via configuration file
 
-CURL_OPTIONS=""
-
-if curl -V | grep -qs http2
-then
-	CURL_OPTIONS="${CURL_OPTIONS} --http2"
-fi
-
 if [ -z "${SYSTEM}" ]
 then
 	# Downloading container list
@@ -259,7 +252,7 @@ then
 		GREP_PATTERN="${GREP_PATTERN:-${ARCHITECTURE}}"
 
 		echo "Downloading $(echo ${SERVER} | awk -F/ '{ print $3 }') container list"
-		curl	--fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} ${CURL_OPTIONS} \
+		curl	--fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} --http2 \
 			"${SERVER}/container-list.txt" | grep -E "${GREP_PATTERN}" > "${DEBCONF_TMPDIR}/container-list.txt"
 
 		umask 0022
@@ -320,7 +313,7 @@ do
 		fi
 
 		echo "Downloading ${FILE}"
-		curl	--fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} ${CURL_OPTIONS} ${CURL_TIME_COND} \
+		curl	--fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} --http2 ${CURL_TIME_COND} \
 			"${SERVER}/${FILE}" -o "${CACHE}/${FILE}"
 	fi
 done