From 277aea80e892f61104bf99cfa1c2bf48df352283 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Tue, 25 Oct 2016 14:46:12 +0200
Subject: Removing obsolete configuration for network in interfaces of debconf
 container create script.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/doc/examples/cairon-backports.cfg        |  1 -
 share/scripts/debconf                          |  6 ------
 share/scripts/debconf.d/0003-debconf           | 18 ------------------
 share/scripts/debconf.d/0003-debconf.templates |  8 --------
 4 files changed, 33 deletions(-)

(limited to 'share')

diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg
index 7cacb07..b4cd45c 100644
--- a/share/doc/examples/cairon-backports.cfg
+++ b/share/doc/examples/cairon-backports.cfg
@@ -36,7 +36,6 @@ container-tools cnt-debconf/network0/ipv4-comment string Primary network interfa
 container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2
 container-tools cnt-debconf/network0/ipv4-gateway string 192.168.0.1
 container-tools cnt-debconf/network0/ipv4-netmask string 255.255.255.0
-container-tools cnt-debconf/network0/ipv4-network string 192.168.0.0
 #container-tools cnt-debconf/network0/ipv4-post-up string 
 #container-tools cnt-debconf/network0/ipv4-post-down string 
 
diff --git a/share/scripts/debconf b/share/scripts/debconf
index e3f5936..155c022 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -739,7 +739,6 @@ EOF
 		eval IPV4_ADDRESS="$`echo NETWORK${NUMBER}_IPV4_ADDRESS`"
 		eval IPV4_GATEWAY="$`echo NETWORK${NUMBER}_IPV4_GATEWAY`"
 		eval IPV4_NETMASK="$`echo NETWORK${NUMBER}_IPV4_NETMASK`"
-		eval IPV4_NETWORK="$`echo NETWORK${NUMBER}_IPV4_NETWORK`"
 		eval IPV4_POST_UP="$`echo NETWORK${NUMBER}_IPV4_POST_UP`"
 		eval IPV4_POST_DOWN="$`echo NETWORK${NUMBER}_IPV4_POST_DOWN`"
 
@@ -791,11 +790,6 @@ EOF
 					echo "	netmask		${IPV4_NETMASK}" >> "${DIRECTORY}/etc/network/interfaces.tmp"
 				fi
 
-				if [ -n "${IPV4_NETWORK}" ]
-				then
-					echo "	network		${IPV4_NETWORK}" >> "${DIRECTORY}/etc/network/interfaces.tmp"
-				fi
-
 				if [ -n "${IPV4_POST_UP}" ]
 				then
 					echo "	post-up		${IPV4_POST_UP}" >> "${DIRECTORY}/etc/network/interfaces.tmp"
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index b232afc..92d9f0e 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -717,9 +717,6 @@ Network ()
 	db_get cnt-debconf/network0/ipv4-netmask
 	NETWORK0_IPV4_NETMASK="${RET}" # string (w/o empty)
 
-	db_get cnt-debconf/network0/ipv4-network
-	NETWORK0_IPV4_NETWORK="${RET}" # string (w/ empty)
-
 	db_get cnt-debconf/network0/ipv4-post-up
 	NETWORK0_IPV4_POST_UP="${RET}" # string (w/ empty)
 
@@ -761,9 +758,6 @@ Network ()
 	db_set cnt-debconf/network0/ipv4-netmask "${NETWORK0_IPV4_NETMASK}"
 	db_fset cnt-debconf/network0/ipv4-netmask seen false
 
-	db_set cnt-debconf/network0/ipv4-network "${NETWORK0_IPV4_NETWORK}"
-	db_fset cnt-debconf/network0/ipv4-network seen false
-
 	db_set cnt-debconf/network0/ipv4-post-up "${NETWORK0_IPV4_POST_UP}"
 	db_fset cnt-debconf/network0/ipv4-post-up seen false
 
@@ -816,10 +810,6 @@ Network ()
 			db_input high cnt-debconf/network0/ipv4-netmask || true
 			db_go
 
-			db_settitle cnt-debconf/title
-			db_input high cnt-debconf/network0/ipv4-network || true
-			db_go
-
 			db_settitle cnt-debconf/title
 			db_input high cnt-debconf/network0/ipv4-post-up || true
 			db_go
@@ -873,11 +863,6 @@ Network ()
 			eval NETWORK${NUMBER}_IPV4_NETMASK="\"${RET}\"" # string (w/o empty)
 		fi
 
-		if db_get cnt-debconf/network${NUMBER}/ipv4-network
-		then
-			eval NETWORK${NUMBER}_IPV4_NETWORK="\"${RET}\"" # string (w/ empty)
-		fi
-
 		if db_get cnt-debconf/network${NUMBER}/ipv4-post-up
 		then
 			eval NETWORK${NUMBER}_IPV4_POST_UP="\"${RET}\"" # string (w/ empty)
@@ -932,9 +917,6 @@ Network ()
 		eval NETMASK="$`echo NETWORK${NUMBER}_IPV4_NETMASK`"
 		echo "NETWORK${NUMBER}_IPV4_NETMASK=\"${NETMASK}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
-		eval NETWORK="$`echo NETWORK${NUMBER}_IPV4_NETWORK`"
-		echo "NETWORK${NUMBER}_IPV4_NETWORK=\"${NETWORK}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
-
 		eval POST_UP="$`echo NETWORK${NUMBER}_IPV4_POST_UP`"
 		echo "NETWORK${NUMBER}_IPV4_POST_UP=\"${POST_UP}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates
index 67c23d6..e46fa88 100644
--- a/share/scripts/debconf.d/0003-debconf.templates
+++ b/share/scripts/debconf.d/0003-debconf.templates
@@ -146,14 +146,6 @@ Description: Ethernet Network Mask (IPv4)?
  .
  This defaults to empty.
 
-Template: cnt-debconf/network0/ipv4-network
-Type: string
-Default:
-Description: Ethernet Network Address (IPv4)?
- What should be the network address of the current system?
- .
- This defaults to empty.
-
 Template: cnt-debconf/network0/ipv4-post-up
 Type: string
 Default:
-- 
cgit v1.2.3