diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-05-18 18:28:46 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-05-18 18:29:07 +0000 |
| commit | b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd (patch) | |
| tree | a462154b0ea87956dca914338f88544f205ba06a /share/scripts/debconf.d | |
| parent | Releasing debian version 20160501-1. (diff) | |
| download | open-infrastructure-compute-tools-b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd.tar.xz open-infrastructure-compute-tools-b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd.zip | |
Merging upstream version 20160515.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share/scripts/debconf.d')
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 21 | ||||
| -rw-r--r-- | share/scripts/debconf.d/0003-debconf.templates | 6 |
2 files changed, 27 insertions, 0 deletions
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index 03db192..df14ef0 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 veth-$(echo ${NAME} | cut -c-8)-0)" + 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 |