diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2016-10-25 12:46:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2016-10-25 12:46:12 +0000 |
| commit | 454491bcde84b84fb862e7fa180649b6facf13db (patch) | |
| tree | b30076173e7b106ef728b23fd24e06f8ca24c3b1 | |
| parent | Switching from ftp.debian.org as default debian mirror to deb.debian.org in d... (diff) | |
| download | compute-tools-454491bcde84b84fb862e7fa180649b6facf13db.tar.xz compute-tools-454491bcde84b84fb862e7fa180649b6facf13db.zip | |
Removing obsolete configuration for broadcast in interfaces of debconf container create script.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
| -rw-r--r-- | share/doc/examples/cairon-backports.cfg | 1 | ||||
| -rwxr-xr-x | share/scripts/debconf | 6 | ||||
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 18 | ||||
| -rw-r--r-- | share/scripts/debconf.d/0003-debconf.templates | 8 |
4 files changed, 0 insertions, 33 deletions
diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg index 107b429..7cacb07 100644 --- a/share/doc/examples/cairon-backports.cfg +++ b/share/doc/examples/cairon-backports.cfg @@ -34,7 +34,6 @@ container-tools cnt-debconf/network0/veth string veth0 container-tools cnt-debconf/network0/ipv4-method select static container-tools cnt-debconf/network0/ipv4-comment string Primary network interfaces container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2 -container-tools cnt-debconf/network0/ipv4-broadcast string 192.168.0.255 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 diff --git a/share/scripts/debconf b/share/scripts/debconf index 2b3563c..e3f5936 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -737,7 +737,6 @@ EOF eval IPV4_COMMENT="$`echo NETWORK${NUMBER}_IPV4_COMMENT`" eval IPV4_METHOD="$`echo NETWORK${NUMBER}_IPV4_METHOD`" eval IPV4_ADDRESS="$`echo NETWORK${NUMBER}_IPV4_ADDRESS`" - eval IPV4_BROADCAST="$`echo NETWORK${NUMBER}_IPV4_BROADCAST`" eval IPV4_GATEWAY="$`echo NETWORK${NUMBER}_IPV4_GATEWAY`" eval IPV4_NETMASK="$`echo NETWORK${NUMBER}_IPV4_NETMASK`" eval IPV4_NETWORK="$`echo NETWORK${NUMBER}_IPV4_NETWORK`" @@ -782,11 +781,6 @@ iface eth${NUMBER} inet static address ${IPV4_ADDRESS} EOF - if [ -n "${IPV4_BROADCAST}" ] - then - echo " broadcast ${IPV4_BROADCAST}" >> "${DIRECTORY}/etc/network/interfaces.tmp" - fi - if [ -n "${IPV4_GATEWAY}" ] then echo " gateway ${IPV4_GATEWAY}" >> "${DIRECTORY}/etc/network/interfaces.tmp" diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index a63eec6..b232afc 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -711,9 +711,6 @@ Network () db_get cnt-debconf/network0/ipv4-address NETWORK0_IPV4_ADDRESS="${RET}" # string (w/o empty) - db_get cnt-debconf/network0/ipv4-broadcast - NETWORK0_IPV4_BROADCAST="${RET}" # string (w/ empty) - db_get cnt-debconf/network0/ipv4-gateway NETWORK0_IPV4_GATEWAY="${RET}" # string (w/ empty) @@ -758,9 +755,6 @@ Network () db_set cnt-debconf/network0/ipv4-address "${NETWORK0_IPV4_ADDRESS}" db_fset cnt-debconf/network0/ipv4-address seen false - db_set cnt-debconf/network0/ipv4-broadcast "${NETWORK0_IPV4_BROADCAST}" - db_fset cnt-debconf/network0/ipv4-broadcast seen false - db_set cnt-debconf/network0/ipv4-gateway "${NETWORK0_IPV4_GATEWAY}" db_fset cnt-debconf/network0/ipv4-gateway seen false @@ -815,10 +809,6 @@ Network () db_go db_settitle cnt-debconf/title - db_input high cnt-debconf/network0/ipv4-broadcast || true - db_go - - db_settitle cnt-debconf/title db_input high cnt-debconf/network0/ipv4-gateway || true db_go @@ -873,11 +863,6 @@ Network () eval NETWORK${NUMBER}_IPV4_ADDRESS="\"${RET}\"" # string (w/o empty) fi - if db_get cnt-debconf/network${NUMBER}/ipv4-broadcast - then - eval NETWORK${NUMBER}_IPV4_BROADCAST="\"${RET}\"" # string (w/ empty) - fi - if db_get cnt-debconf/network${NUMBER}/ipv4-gateway then eval NETWORK${NUMBER}_IPV4_GATEWAY="\"${RET}\"" # string (w/ empty) @@ -941,9 +926,6 @@ Network () eval ADDRESS="$`echo NETWORK${NUMBER}_IPV4_ADDRESS`" echo "NETWORK${NUMBER}_IPV4_ADDRESS=\"${ADDRESS}\"" >> "${DEBCONF_TMPDIR}/debconf.default" - eval BROADCAST="$`echo NETWORK${NUMBER}_IPV4_BROADCAST`" - echo "NETWORK${NUMBER}_IPV4_BROADCAST=\"${BROADCAST}\"" >> "${DEBCONF_TMPDIR}/debconf.default" - eval GATEWAY="$`echo NETWORK${NUMBER}_IPV4_GATEWAY`" echo "NETWORK${NUMBER}_IPV4_GATEWAY=\"${GATEWAY}\"" >> "${DEBCONF_TMPDIR}/debconf.default" diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates index 82a7ca1..67c23d6 100644 --- a/share/scripts/debconf.d/0003-debconf.templates +++ b/share/scripts/debconf.d/0003-debconf.templates @@ -130,14 +130,6 @@ Description: Ethernet IP Address (IPv4)? . This defaults to 192.168.1.2. -Template: cnt-debconf/network0/ipv4-broadcast -Type: string -Default: -Description: Ethernet Broadcast Address (IPv4)? - What should be the broadcast address of the current system? - . - This defaults to empty. - Template: cnt-debconf/network0/ipv4-gateway Type: string Default: |