From 221bf95949d4176e5276c7e8bfafa56c9104328b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 27 Feb 2022 12:35:36 +0100 Subject: Adding support for deriving IP interface addresses from DNS. Signed-off-by: Daniel Baumann --- share/build-scripts/debconf.d/0003-debconf | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'share/build-scripts/debconf.d/0003-debconf') diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf index c1c4e79..4b6a57f 100755 --- a/share/build-scripts/debconf.d/0003-debconf +++ b/share/build-scripts/debconf.d/0003-debconf @@ -680,10 +680,12 @@ Network_defaults () NETWORK1_BRIDGE="${NETWORK1_BRIDGE:-bridge0}" NETWORK1_IPV4_METHOD="${NETWORK1_IPV4_METHOD:-dhcp}" + NETWORK1_IPV4_ADDRESS_DNS="${NETWORK1_IPV4_ADDRESS_DNS:-${NAME}}" NETWORK1_IPV4_ADDRESS="${NETWORK1_IPV4_ADDRESS:-192.168.1.2}" NETWORK1_IPV4_NETMASK="${NETWORK1_IPV4_NETMASK:-24}" NETWORK1_IPV6_METHOD="${NETWORK1_IPV6_METHOD:-none}" + NETWORK1_IPV6_ADDRESS_DNS="${NETWORK1_IPV6_ADDRESS_DNS:-${NAME}}" NETWORK1_IPV6_ADDRESS="${NETWORK1_IPV6_ADDRESS:-fc00::2}" NETWORK1_IPV6_NETMASK="${NETWORK1_IPV6_NETMASK:-7}" @@ -716,6 +718,9 @@ Network () db_get container/network1/ipv4-comment NETWORK1_IPV4_COMMENT="${RET}" # string (w/ empty) + db_get container/network1/ipv4-address-dns + NETWORK1_IPV4_ADDRESS_DNS="${RET:-${NAME}}" # string (w/o empty) + db_get container/network1/ipv4-address NETWORK1_IPV4_ADDRESS="${RET}" # string (w/o empty) @@ -737,6 +742,9 @@ Network () db_get container/network1/ipv6-comment NETWORK1_IPV6_COMMENT="${RET}" # string (w/ empty) + db_get container/network1/ipv6-address-dns + NETWORK1_IPV6_ADDRESS_DNS="${RET:-${NAME}}" # string (w/o empty) + db_get container/network1/ipv6-address NETWORK1_IPV6_ADDRESS="${RET}" # string (w/o empty) @@ -778,6 +786,9 @@ Network () db_set container/network1/ipv4-comment "${NETWORK1_IPV4_COMMENT}" db_fset container/network1/ipv4-comment seen false + db_set container/network1/ipv4-address-dns "${NETWORK1_IPV4_ADDRESS_DNS}" + db_fset container/network1/ipv4-address-dns seen false + db_set container/network1/ipv4-address "${NETWORK1_IPV4_ADDRESS}" db_fset container/network1/ipv4-address seen false @@ -799,6 +810,9 @@ Network () db_set container/network1/ipv6-comment "${NETWORK1_IPV6_COMMENT}" db_fset container/network1/ipv6-comment seen false + db_set container/network1/ipv6-address-dns "${NETWORK1_IPV6_ADDRESS_DNS}" + db_fset container/network1/ipv6-address-dns seen false + db_set container/network1/ipv6-address "${NETWORK1_IPV6_ADDRESS}" db_fset container/network1/ipv6-address seen false @@ -848,6 +862,10 @@ Network () db_input high container/network1/ipv4-comment || true db_go + db_settitle container/title + db_input high container/network1/ipv4-address-dns || true + db_go + db_settitle container/title db_input high container/network1/ipv4-address || true db_go @@ -886,6 +904,10 @@ Network () db_input high container/network1/ipv6-comment || true db_go + db_settitle container/title + db_input high container/network1/ipv6-address-dns || true + db_go + db_settitle container/title db_input high container/network1/ipv6-address || true db_go @@ -946,6 +968,11 @@ Network () eval NETWORK${NUMBER}_IPV4_METHOD="\"${RET}\"" # select fi + if db_get container/network${NUMBER}/ipv4-address-dns + then + eval NETWORK${NUMBER}_IPV4_ADDRESS_DNS="\"${RET}\"" # string (w/ empty) + fi + if db_get container/network${NUMBER}/ipv4-address then eval NETWORK${NUMBER}_IPV4_ADDRESS="\"${RET}\"" # string (w/o empty) @@ -984,6 +1011,11 @@ Network () eval NETWORK${NUMBER}_IPV6_METHOD="\"${RET}\"" # select fi + if db_get container/network${NUMBER}/ipv6-address-dns + then + eval NETWORK${NUMBER}_IPV6_ADDRESS_DNS="\"${RET}\"" # string (w/ empty) + fi + if db_get container/network${NUMBER}/ipv6-address then eval NETWORK${NUMBER}_IPV6_ADDRESS="\"${RET}\"" # string (w/o empty) @@ -1040,6 +1072,9 @@ Network () eval METHOD="$`echo NETWORK${NUMBER}_IPV4_METHOD`" echo "NETWORK${NUMBER}_IPV4_METHOD=\"${METHOD}\"" >> "${DEBCONF_TMPDIR}/debconf.default" + eval ADDRESS_DNS="$`echo NETWORK${NUMBER}_IPV4_ADDRESS_DNS`" + echo "NETWORK${NUMBER}_IPV4_ADDRESS_DNS=\"${ADDRESS_DNS}\"" >> "${DEBCONF_TMPDIR}/debconf.default" + eval ADDRESS="$`echo NETWORK${NUMBER}_IPV4_ADDRESS`" echo "NETWORK${NUMBER}_IPV4_ADDRESS=\"${ADDRESS}\"" >> "${DEBCONF_TMPDIR}/debconf.default" @@ -1061,6 +1096,9 @@ Network () eval METHOD="$`echo NETWORK${NUMBER}_IPV6_METHOD`" echo "NETWORK${NUMBER}_IPV6_METHOD=\"${METHOD}\"" >> "${DEBCONF_TMPDIR}/debconf.default" + eval ADDRESS_DNS="$`echo NETWORK${NUMBER}_IPV6_ADDRESS_DNS`" + echo "NETWORK${NUMBER}_IPV6_ADDRESS_DNS=\"${ADDRESS_DNS}\"" >> "${DEBCONF_TMPDIR}/debconf.default" + eval ADDRESS="$`echo NETWORK${NUMBER}_IPV6_ADDRESS`" echo "NETWORK${NUMBER}_IPV6_ADDRESS=\"${ADDRESS}\"" >> "${DEBCONF_TMPDIR}/debconf.default" -- cgit v1.2.3