Merging upstream version 20170722.

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

1 files changed, 24 insertions, 34 deletions

diff --git a/share/scripts/debconf b/share/scripts/debconf
index 38bf937..6190c31 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -19,6 +19,7 @@
 set -e
 
 SCRIPT="${0}"
+export SCRIPT
 
 CONFIG="/etc/container-tools/config"
 HOOKS="/etc/container-tools/hooks"
@@ -809,7 +810,7 @@ Configure_systemd_networkd ()
 
 	chroot "${DIRECTORY}" systemctl enable systemd-networkd
 
-	for NUMBER in $(seq 0 ${NETWORK_NUMBER})
+	for NUMBER in $(seq 1 ${NETWORK_NUMBER})
 	do
 		eval IPV4_COMMENT="$`echo NETWORK${NUMBER}_IPV4_COMMENT`"
 		eval IPV4_METHOD="$`echo NETWORK${NUMBER}_IPV4_METHOD`"
@@ -827,22 +828,22 @@ Configure_systemd_networkd ()
 		IPV4_SUFFIX="$(CIDR ${IPV4_NETMASK})"
 		IPV4_CIDR="${IPV4_ADDRESS}/${IPV4_SUFFIX}"
 
-cat > "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat > "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 [Match]
-Name=eth${NUMBER}
+Name=eno${NUMBER}
 
 [Network]
 EOF
 
 		if [ -n "${IPV4_COMMENT}" ]
 		then
-			echo "Description=${IPV4_COMMENT}" >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network"
+			echo "Description=${IPV4_COMMENT}" >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network"
 		fi
 
 		case "${IPV4_METHOD}" in
 			dhcp)
 
-cat >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 DHCP=ipv4
 EOF
 
@@ -850,7 +851,7 @@ EOF
 
 			static)
 
-cat >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 DHCP=no
 Address=${IPV4_CIDR}
 EOF
@@ -858,7 +859,7 @@ EOF
 				if [ -n "${IPV4_GATEWAY}" ]
 				then
 
-cat >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 Gateway=${IPV4_GATEWAY}
 EOF
 
@@ -868,7 +869,7 @@ EOF
 		if [ -n "${IPV4_POST_UP}" ]
 		then
 
-cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-up-eth${NUMBER}.service" << EOF
+cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-up-eno${NUMBER}.service" << EOF
 [Unit]
 Description=container-tools IPV4_POST_UP
 After=network-online.target
@@ -882,13 +883,13 @@ ExecStart=/bin/sh -c "${IPV4_POST_UP}"
 WantedBy=multi-user.target
 EOF
 
-			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-up-eth${NUMBER}.service
+			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-up-eno${NUMBER}.service
 		fi
 
 		if [ -n "${IPV4_POST_DOWN}" ]
 		then
 
-cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-down-eth${NUMBER}.service" << EOF
+cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-down-eno${NUMBER}.service" << EOF
 [Unit]
 Description=container-tools IPV4_POST_DOWN
 After=network.target
@@ -902,7 +903,7 @@ ExecStart=/bin/sh -c "${IPV4_POST_DOWN}"
 WantedBy=multi-user.target
 EOF
 
-			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-down-eth${NUMBER}.service
+			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-down-eno${NUMBER}.service
 		fi
 
 		NUMBER="$((${NUMBER} + 1))"
@@ -932,11 +933,11 @@ Commands ()
 
 	sed -i	-e "s|^cnt.auto=.*|cnt.auto=${CNT_AUTO}|g" \
 		-e "s|^cnt.container-server=.*|cnt.container-server=${CNT_CONTAINER_SERVER}|g" \
-		-e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK0_BRIDGE:-br0}|g" \
+		-e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK0_BRIDGE:-bridge0}|g" \
 		-e "s|^cnt.overlay=.*|cnt.overlay=${CNT_OVERLAY}|g" \
 		-e "s|^bind=.*|bind=${BIND}|g" \
 		-e "s|^bind-ro=.*|bind-ro=${BIND_RO}|g" \
-		-e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eth0|g" \
+		-e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eno1|g" \
 	"${CONFIG}/${NAME}.conf"
 
 	for NUMBER in $(seq 1 ${NETWORK_NUMBER})
@@ -951,12 +952,12 @@ Commands ()
 		eval HOST_INTERFACE_NAME="$`echo NETWORK${NUMBER}_VETH`"
 
 		HOST_INTERFACE_NAME="$(echo ${HOST_INTERFACE_NAME:-veth-${HOSTNAME_SHORT}-${NUMBER}})"
-		CONTAINER_INTERFACE_NAME="eth${NUMBER}"
+		CONTAINER_INTERFACE_NAME="eno${NUMBER}"
 
 		sed -i -e "/^register=.*/ a network-veth-extra=${HOST_INTERFACE_NAME}:${CONTAINER_INTERFACE_NAME}" "${CONFIG}/${NAME}.conf"
 
 		eval BRIDGE="$`echo NETWORK${NUMBER}_BRIDGE`"
-		sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-br${NUMBER}}" "${CONFIG}/${NAME}.conf"
+		sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-bridge${NUMBER}}" "${CONFIG}/${NAME}.conf"
 	done
 
 	# Setting root password
@@ -971,24 +972,10 @@ Commands ()
 
 umask 0022
 
-# Get distributor from template filename
-MODE="$(basename ${SCRIPT})"
-
-case "${MODE}" in
-	debconf)
-		MODE="debian"
-		;;
-esac
-
-export MODE
-
-CACHE="/var/cache/container-tools/${MODE}"
-SYSTEM="${MACHINES}/${NAME}"
+export NAME
 
 Debconf
 
-export NAME
-
 # Pre hooks
 for FILE in "${HOOKS}/pre-${SCRIPT}".* "${HOOKS}/${NAME}.pre-${SCRIPT}"
 do
@@ -999,19 +986,22 @@ do
 done
 
 # Run debconf parts
-for SCRIPT in /usr/share/container-tools/scripts/debconf.d/*
+for DEBCONF_SCRIPT in /usr/share/container-tools/scripts/debconf.d/*
 do
-	if [ -x "${SCRIPT}" ]
+	if [ -x "${DEBCONF_SCRIPT}" ]
 	then
 		# FIXME
-		# debconf -ocontainer-tools "${SCRIPT}"
-		"${SCRIPT}"
+		# debconf -ocontainer-tools "${DEBCONF_SCRIPT}"
+		"${DEBCONF_SCRIPT}"
 	fi
 done
 
 # Read-in configuration from debconf
 . "${DEBCONF_TMPDIR}/debconf.default"
 
+CACHE="/var/cache/container-tools/${MODE}"
+SYSTEM="${MACHINES}/${NAME}"
+
 ## Generic parts
 if [ ! -e "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" ]
 then