From 29304d802385787ca4dd04ad6d8d18bb1f01bc2d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Wed, 18 May 2016 11:33:34 +0200
Subject: Adding upstream version 20160515.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 share/scripts/debconf | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

(limited to 'share/scripts/debconf')

diff --git a/share/scripts/debconf b/share/scripts/debconf
index cbde345..55c2b8b 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -46,7 +46,7 @@ Parameters ()
 				shift 2
 				;;
 
-			--cnt.autostart)
+			--cnt.auto)
 				# ignore
 				shift 2
 				;;
@@ -702,7 +702,7 @@ EOF
 	then
 		echo "${CONTAINER_COMMAND}" > "${DIRECTORY}/.container-command"
 
-		chmod 0755 "sh /.container-command"
+		chmod 0755 "${DIRECTORY}/.container-command"
 		Chroot "${DIRECTORY}" "sh /.container-command"
 
 		rm -f "${DIRECTORY}/.container-command"
@@ -749,7 +749,7 @@ EOF
 			none)
 
 cat >> "${DIRECTORY}/etc/network/interfaces.tmp" << EOF
-iface host${NUMBER} inet manual
+iface eth${NUMBER} inet manual
 EOF
 
 				;;
@@ -757,8 +757,8 @@ EOF
 			dhcp)
 
 cat >> "${DIRECTORY}/etc/network/interfaces.tmp" << EOF
-auto host${NUMBER}
-iface host${NUMBER} inet dhcp
+auto eth${NUMBER}
+iface eth${NUMBER} inet dhcp
 EOF
 
 				;;
@@ -766,8 +766,8 @@ EOF
 			static)
 
 cat >> "${DIRECTORY}/etc/network/interfaces.tmp" << EOF
-auto host${NUMBER}
-iface host${NUMBER} inet static
+auto eth${NUMBER}
+iface eth${NUMBER} inet static
 	address		${IPV4_ADDRESS}
 EOF
 
@@ -902,7 +902,33 @@ Commands ()
 	fi
 
 	# config (FIXME)
-	sed -i -e "s|^network-bridge=.*|network-bridge=${NETWORK0_BRIDGE}|" "${CONFIG}/${NAME}.conf"
+
+	# maximum of 15 characters, prefix is 'veth-'
+	HOSTNAME_SHORT="$(echo ${NAME} | cut -c-8)"
+	HOST_INTERFACE_NAME="$(echo ${NETWORK0_VETH:-veth-${HOSTNAME_SHORT}-0})"
+
+	sed -i -e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK0_BRIDGE:-br0}|g" "${CONFIG}/${NAME}.conf"
+	sed -i -e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eth0|g" "${CONFIG}/${NAME}.conf"
+
+	for NUMBER in $(seq 1 ${NETWORK_NUMBER})
+	do
+		eval IPV4_METHOD="$`echo NETWORK${NUMBER}_IPV4_METHOD`"
+
+		if [ -z "${IPV4_METHOD}" ]
+		then
+			continue
+		fi
+
+		eval HOST_INTERFACE_NAME="$`echo NETWORK${NUMBER}_VETH`"
+
+		HOST_INTERFACE_NAME="$(echo ${HOST_INTERFACE_NAME:-veth-${HOSTNAME_SHORT}-${NUMBER}})"
+		CONTAINER_INTERFACE_NAME="eth${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"
+	done
 
 	# Setting root password
 	echo root:${ROOT_PASSWORD} | chroot "${DIRECTORY}" chpasswd
@@ -932,6 +958,8 @@ SYSTEM="${MACHINES}/${NAME}"
 
 Debconf
 
+export NAME
+
 # Run debconf parts
 for SCRIPT in /usr/share/container-tools/scripts/debconf.d/*
 do
-- 
cgit v1.2.3