From a62718068b63b230ad1d038e124b15d3b7d1e22f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 1 Nov 2017 09:17:07 +0100
Subject: Merging upstream version 20171101.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/scripts/debconf.d/0001-preseed-file    |  4 ++--
 share/scripts/debconf.d/0002-preseed-debconf | 25 ++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'share/scripts/debconf.d')

diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file
index 663fdc8..d3cc49d 100755
--- a/share/scripts/debconf.d/0001-preseed-file
+++ b/share/scripts/debconf.d/0001-preseed-file
@@ -36,7 +36,7 @@ then
 	# showing debconf selection dialog for global preseed file.
 
 	FILES="$(cd ${CONFIG} && find . -type f -name '*.cfg' -printf '%P\n' | sort)"
-	PRESEED_FILES="$(for FILE in ${FILES}; do echo -n "${FILE}, "; done | sed -e 's|, $||')"
+	PRESEED_FILES="$(for FILE in ${FILES}; do echo -n "$(basename ${FILE} .cfg), "; done | sed -e 's|, $||')"
 
 	if [ -n "${PRESEED_FILES}" ]
 	then
@@ -55,7 +55,7 @@ then
 
 			*)
 				# user specified preseed file through debconf select
-				db_set cnt-debconf/preseed-file "${CONFIG}/${PRESEED_FILE}"
+				db_set cnt-debconf/preseed-file "${CONFIG}/${PRESEED_FILE}.cfg"
 				db_fset cnt-debconf/preseed-file seen true
 				;;
 		esac
diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf
index 48fa6a1..d46121c 100755
--- a/share/scripts/debconf.d/0002-preseed-debconf
+++ b/share/scripts/debconf.d/0002-preseed-debconf
@@ -72,7 +72,30 @@ done
 
 for DEBCONF_PRESEED_FILE in ${DEBCONF_PRESEED_FILES}
 do
-	sed -e "s|@NAME@|${NAME}|g" "${DEBCONF_PRESEED_FILE}" > "${DIRECTORY}/preseed.cfg"
+	if [ -e /usr/bin/kdig ]
+	then
+		DIG="/usr/bin/kdig"
+	elif [ -e /usr/bin/dig ]
+	then
+		DIG="/usr/bin/dig"
+	fi
+
+	if [ -n "${DIG}" ]
+	then
+		IPV4_ADDRESS1="$(${DIG} +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)"
+	fi
+
+	sed -e "s|@NAME@|${NAME}|g" \
+	    -e "s|@IPV4_ADDRESS1@|${IPV4_ADDRESS1}|g" \
+	    -e "s|@IPV4_ADDRESS1_PART1@|${IPV4_ADDRESS1_PART1}|g" \
+	    -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" \
+	"${DEBCONF_PRESEED_FILE}" > "${DIRECTORY}/preseed.cfg"
 
 	# Apply user specified preseed files
 	debconf-set-selections "${DIRECTORY}/preseed.cfg"
-- 
cgit v1.2.3