From bc53e5a0e1a692200313d64ff0a1fd8d8b34ab4f Mon Sep 17 00:00:00 2001
From: Nik Lutz <nik@netstyle.ch>
Date: Thu, 12 May 2016 17:40:10 +0200
Subject: Using systemd-nspawn '--network-veth-extra=' instead of
 '--network-veth' (prerequisite for multiple network interface support per
 container).

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/config/container.conf.in       |  2 +-
 share/scripts/debconf                | 25 +++++++++++++++++++++++++
 share/scripts/debconf.d/0003-debconf |  4 ++--
 3 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'share')

diff --git a/share/config/container.conf.in b/share/config/container.conf.in
index fbf8078..f7d01be 100644
--- a/share/config/container.conf.in
+++ b/share/config/container.conf.in
@@ -8,7 +8,7 @@ capability=@CAPABILITY@
 directory=@DIRECTORY@
 drop-capability=@DROP_CAPABILITY@
 machine=@MACHINE@
-network-veth=@NETWORK_VETH@
+network-veth-extra=@NETWORK_VETH_EXTRA@
 network-bridge=@NETWORK_BRIDGE@
 link-journal=@LINK_JOURNAL@
 register=@REGISTER@
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 28e95fd..24202b0 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -904,6 +904,29 @@ Commands ()
 	# 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|^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"
+	done
+
 	# Setting root password
 	echo root:${ROOT_PASSWORD} | chroot "${DIRECTORY}" chpasswd
 
@@ -932,6 +955,8 @@ SYSTEM="${MACHINES}/${NAME}"
 
 Debconf
 
+export NAME
+
 # Run debconf parts
 for SCRIPT in /usr/share/container-tools/scripts/debconf.d/*
 do
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index d1fd7e1..df14ef0 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -673,10 +673,10 @@ Network_defaults ()
 	#   * respect pre-existing interfaces (or interfaces.d)
 	#   * add support for bridges (make interface configuration more generic?)
 
-	HOSTNAME_SHORT="$(echo ${NAME} | cut -c-9)"
+	HOSTNAME_SHORT="$(echo veth-$(echo ${NAME} | cut -c-8)-0)"
 	VETH_NAME="$(echo ${HOSTNAME_SHORT:-veth0})"
 
-	NETWORK0_VETH="${NETWORK0_VETH:-VETH_NAME}"
+	NETWORK0_VETH="${NETWORK0_VETH:-$VETH_NAME}"
 	NETWORK0_BRIDGE="${NETWORK0_BRIDGE:-br0}"
 	NETWORK0_IPV4_METHOD="${NETWORK0_IPV4_METHOD:-dhcp}"
 	NETWORK0_IPV4_ADDRESS="${NETWORK0_IPV4_ADDRESS:-192.168.1.2}"
-- 
cgit v1.2.3