summaryrefslogtreecommitdiffstats
path: root/share/scripts/debconf.d/0002-preseed-debconf
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-03-19 13:12:05 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-03-19 19:51:21 +0000
commit84cc416d5db2ed05bdb22471690ec9e443b41e3c (patch)
tree8ba97b10e4df3aa19facb1351ee6171a06460e85 /share/scripts/debconf.d/0002-preseed-debconf
parentUsing C.UTF-8 in container enter command as fallback locale. (diff)
downloadcompute-tools-84cc416d5db2ed05bdb22471690ec9e443b41e3c.tar.xz
compute-tools-84cc416d5db2ed05bdb22471690ec9e443b41e3c.zip
Adding initial support for IPv6 in debconf container create script.
Note that this also removes support for non-CIDR IPv4 subnetmasks, e.g. '255.255.255.0' now has to be specified as '24'. Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'share/scripts/debconf.d/0002-preseed-debconf')
-rwxr-xr-xshare/scripts/debconf.d/0002-preseed-debconf5
1 files changed, 4 insertions, 1 deletions
diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf
index 9aca6bf..8877654 100755
--- a/share/scripts/debconf.d/0002-preseed-debconf
+++ b/share/scripts/debconf.d/0002-preseed-debconf
@@ -83,11 +83,13 @@ do
if [ -n "${DIG}" ]
then
- IPV4_ADDRESS1="$(${DIG} +short ${NAME} | tail -n1)"
+ IPV4_ADDRESS1="$(${DIG} A +short ${NAME} | tail -n1)"
IPV4_ADDRESS1_PART1="$(echo ${IPV4_ADDRESS1} | cut -d. -f1)"
IPV4_ADDRESS1_PART2="$(echo ${IPV4_ADDRESS1} | cut -d. -f2)"
IPV4_ADDRESS1_PART3="$(echo ${IPV4_ADDRESS1} | cut -d. -f3)"
IPV4_ADDRESS1_PART4="$(echo ${IPV4_ADDRESS1} | cut -d. -f4)"
+
+ IPV6_ADDRESS1="$(${DIG} AAAA +short ${NAME} | tail -n1)"
fi
sed -e "s|@NAME@|${NAME}|g" \
@@ -96,6 +98,7 @@ do
-e "s|@IPV4_ADDRESS1_PART2@|${IPV4_ADDRESS1_PART2}|g" \
-e "s|@IPV4_ADDRESS1_PART3@|${IPV4_ADDRESS1_PART3}|g" \
-e "s|@IPV4_ADDRESS1_PART4@|${IPV4_ADDRESS1_PART4}|g" \
+ -e "s|@IPV6_ADDRESS1@|${IPV6_ADDRESS1}|g" \
"${DEBCONF_PRESEED_FILE}" > "${DIRECTORY}/preseed.cfg"
# Apply user specified preseed files