From e610d31483a0b6f378a572f814fc9be0cee47ec5 Mon Sep 17 00:00:00 2001
From: Nik Lutz <nik@netstyle.ch>
Date: Wed, 11 May 2016 15:30:03 +0200
Subject: Adding veth name (cnt-debconf/network[0-9]/veth) configuration option
 to debconf script.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/debconf.d/0003-debconf           | 21 +++++++++++++++++++++
 share/scripts/debconf.d/0003-debconf.templates |  6 ++++++
 2 files changed, 27 insertions(+)

(limited to 'share')

diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 03db192..d1fd7e1 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -673,6 +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)"
+	VETH_NAME="$(echo ${HOSTNAME_SHORT:-veth0})"
+
+	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}"
@@ -695,6 +699,9 @@ Network ()
 	db_get cnt-debconf/network0/bridge
 	NETWORK0_BRIDGE="${RET}" # string (w/o empty)
 
+	db_get cnt-debconf/network0/veth
+	NETWORK0_VETH="${RET}" # string (w/o empty)
+
 	db_get cnt-debconf/network0/ipv4-method
 	NETWORK0_IPV4_METHOD="${RET}" # select
 
@@ -739,6 +746,9 @@ Network ()
 	db_set cnt-debconf/network0/bridge "${NETWORK0_BRIDGE}"
 	db_fset cnt-debconf/network0/bridge seen false
 
+	db_set cnt-debconf/network0/veth "${NETWORK0_VETH}"
+	db_fset cnt-debconf/network0/veth seen false
+
 	db_set cnt-debconf/network0/ipv4-method "${NETWORK0_IPV4_METHOD}"
 	db_fset cnt-debconf/network0/ipv4-method seen false
 
@@ -785,6 +795,9 @@ Network ()
 	db_get cnt-debconf/network0/bridge
 	NETWORK0_BRIDGE="${RET}" # select
 
+	db_get cnt-debconf/network0/veth
+	NETWORK0_VETH="${RET}" # select
+
 	db_get cnt-debconf/network0/ipv4-method
 	NETWORK0_IPV4_METHOD="${RET}" # select
 
@@ -840,6 +853,11 @@ Network ()
 			eval NETWORK${NUMBER}_BRIDGE="\"${RET}\"" # string (w/o empty)
 		fi
 
+		if db_get cnt-debconf/network${NUMBER}/veth
+		then
+			eval NETWORK${NUMBER}_VETH="\"${RET}\"" # string (w/o empty)
+		fi
+
 		if db_get cnt-debconf/network${NUMBER}/ipv4-comment
 		then
 			eval NETWORK${NUMBER}_IPV4_COMMENT="\"${RET}\"" # string (w/ empty)
@@ -911,6 +929,9 @@ Network ()
 		eval BRIDGE="$`echo NETWORK${NUMBER}_BRIDGE`"
 		echo "NETWORK${NUMBER}_BRIDGE=\"${BRIDGE}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
+		eval VETH="$`echo NETWORK${NUMBER}_VETH`"
+		echo "NETWORK${NUMBER}_VETH=\"${VETH}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+
 		eval COMMENT="$`echo NETWORK${NUMBER}_IPV4_COMMENT`"
 		echo "NETWORK${NUMBER}_IPV4_COMMENT=\"${COMMENT}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates
index c568d72..82a7ca1 100644
--- a/share/scripts/debconf.d/0003-debconf.templates
+++ b/share/scripts/debconf.d/0003-debconf.templates
@@ -98,6 +98,12 @@ Default:
 Description: Bridge
  Bridge.
 
+Template: cnt-debconf/network0/veth
+Type: string
+Default:
+Description: Veth name
+ Veth name.
+
 Template: cnt-debconf/network0/ipv4-method
 Type: select
 Choices: dhcp, static, none
-- 
cgit v1.2.3