From e7265143908a6a85f91306a14293fab2861efbd9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 26 Jul 2021 05:57:17 +0200
Subject: Merging upstream version 20210726.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/doc/examples/bullseye.cfg         |  4 ++--
 share/doc/examples/container-images.sh  | 26 +++++++++++++-------------
 share/doc/examples/fuchur-backports.cfg |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'share/doc')

diff --git a/share/doc/examples/bullseye.cfg b/share/doc/examples/bullseye.cfg
index 044504e..4582c9f 100644
--- a/share/doc/examples/bullseye.cfg
+++ b/share/doc/examples/bullseye.cfg
@@ -1,5 +1,5 @@
-# example for automated Debian 11 (bullseye) based container creation
-# using: sudo container create -s debian
+# example for automated Debian 11 (bullseye) based container building
+# using: sudo container build -s debian
 
 debconf debconf/priority select critical
 debconf debconf/frontend select Noninteractive
diff --git a/share/doc/examples/container-images.sh b/share/doc/examples/container-images.sh
index ede68b5..e6947e3 100755
--- a/share/doc/examples/container-images.sh
+++ b/share/doc/examples/container-images.sh
@@ -17,14 +17,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# Description: example for automated Debian base system container image creation
-# Requires:    debootstrap plzip xz-utils
-# Usage:       sudo ./container-images.sh
+# Description: example for automated Debian base system container image builds
+# Requires:    debootstrap plzip xz-utils sudo
+# Usage:       ./container-images.sh
 
 set -e
 
 ARCHITECTURES="amd64 i386"
-DISTRIBUTIONS="jessie stretch buster sid"
+DISTRIBUTIONS="stretch buster bullseye sid"
 MIRROR="https://deb.debian.org/debian"
 INCLUDE="dbus"
 
@@ -77,29 +77,29 @@ do
 					;;
 			esac
 
-			echo "Creating ${SYSTEM}.system.tar.${COMPRESSION}"
+			echo "Building ${SYSTEM}.system.tar.${COMPRESSION}"
 			sudo tar ${TAR_OPTIONS} -cf "${SYSTEM}.system.tar.${COMPRESSION}" "${SYSTEM}"
 
-			echo "Creating ${SYSTEM}.system.tar.${COMPRESSION}.sha512"
+			echo "Building ${SYSTEM}.system.tar.${COMPRESSION}.sha512"
 			sha512sum "${SYSTEM}.system.tar.${COMPRESSION}" > "${SYSTEM}.system.tar.${COMPRESSION}.sha512"
 
 			if [ -n "${KEY}" ]
 			then
-				echo "Creating ${SYSTEM}.system.tar.${COMPRESSION}.sign"
+				echo "Building ${SYSTEM}.system.tar.${COMPRESSION}.sig"
 				gpg -a -b --default-key ${KEY} ${SYSTEM}.system.tar.${COMPRESSION}
-				mv "${SYSTEM}.system.tar.${COMPRESSION}.asc" "${SYSTEM}.system.tar.${COMPRESSION}.sign"
+				mv "${SYSTEM}.system.tar.${COMPRESSION}.asc" "${SYSTEM}.system.tar.${COMPRESSION}.sig"
 			fi
 
-			echo "Creating ${SYSTEM}.system.tar.${COMPRESSION} symlink"
+			echo "Building ${SYSTEM}.system.tar.${COMPRESSION} symlink"
 			ln -sf "${SYSTEM}.system.tar.${COMPRESSION}" "$(echo ${SYSTEM}.system.tar.${COMPRESSION} | sed -e "s|${DATE}|current|")"
 
-			echo "Creating ${SYSTEM}.system.tar.${COMPRESSION}.sha512 copy"
+			echo "Building ${SYSTEM}.system.tar.${COMPRESSION}.sha512 copy"
 			sed -e "s|${DATE}|current|" "${SYSTEM}.system.tar.${COMPRESSION}.sha512" > "$(echo ${SYSTEM}.system.tar.${COMPRESSION}.sha512 | sed -e "s|${DATE}|current|")"
 
-			if [ -e "${SYSTEM}.system.tar.${COMPRESSION}.sign" ]
+			if [ -e "${SYSTEM}.system.tar.${COMPRESSION}.sig" ]
 			then
-				echo "Creating ${SYSTEM}.system.tar.${COMPRESSION}.sign copy"
-				cp "${SYSTEM}.system.tar.${COMPRESSION}.sign" "$(echo ${SYSTEM}.system.tar.${COMPRESSION}.sign | sed -e "s|${DATE}|current|")"
+				echo "Building ${SYSTEM}.system.tar.${COMPRESSION}.sig copy"
+				cp "${SYSTEM}.system.tar.${COMPRESSION}.sig" "$(echo ${SYSTEM}.system.tar.${COMPRESSION}.sig | sed -e "s|${DATE}|current|")"
 			fi
 		done
 
diff --git a/share/doc/examples/fuchur-backports.cfg b/share/doc/examples/fuchur-backports.cfg
index 20cd127..c02e776 100644
--- a/share/doc/examples/fuchur-backports.cfg
+++ b/share/doc/examples/fuchur-backports.cfg
@@ -1,5 +1,5 @@
-# example for automated Progress Linux 6.99 (fuchur-backports) container creation
-# using: sudo container create -s progress-linux
+# example for automated Progress Linux 6.99 (fuchur-backports) container building
+# using: sudo container build -s progress-linux
 
 debconf debconf/priority select critical
 debconf debconf/frontend select Noninteractive
-- 
cgit v1.2.3