From c332a500d10e424219cd2c7285c27e7cad30634b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 20 Apr 2024 19:12:42 +0200 Subject: Adding debian version 20221223-5. Signed-off-by: Daniel Baumann --- debian/patches/upstream/0001-host-variable.patch | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 debian/patches/upstream/0001-host-variable.patch (limited to 'debian/patches/upstream/0001-host-variable.patch') diff --git a/debian/patches/upstream/0001-host-variable.patch b/debian/patches/upstream/0001-host-variable.patch new file mode 100644 index 0000000..53e9e6d --- /dev/null +++ b/debian/patches/upstream/0001-host-variable.patch @@ -0,0 +1,42 @@ +Author: Daniel Baumann +Description: Adding host variable for preseed files. + +diff -Naurp open-infrastructure-compute-tools.orig/share/build-scripts/debconf open-infrastructure-compute-tools/share/build-scripts/debconf +--- open-infrastructure-compute-tools.orig/share/build-scripts/debconf ++++ open-infrastructure-compute-tools/share/build-scripts/debconf +@@ -123,6 +123,8 @@ then + exit 1 + fi + ++HOST="$(echo ${NAME} | cut -d. -f1)" ++ + Mount () + { + # Mounting rw bind mounts +@@ -686,6 +688,7 @@ EOF + + sed -e "s|@FILE@|${FILE}|g" \ + -e "s|@NAME@|${NAME}|g" \ ++ -e "s|@HOST@|${HOST}|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" \ +@@ -1185,6 +1188,7 @@ trap 'Umount' EXIT HUP INT QUIT TERM + umask 0022 + + export NAME ++export HOST + + Debconf + +diff -Naurp open-infrastructure-compute-tools.orig/share/build-scripts/debconf.d/0002-preseed-debconf open-infrastructure-compute-tools/share/build-scripts/debconf.d/0002-preseed-debconf +--- open-infrastructure-compute-tools.orig/share/build-scripts/debconf.d/0002-preseed-debconf ++++ open-infrastructure-compute-tools/share/build-scripts/debconf.d/0002-preseed-debconf +@@ -93,6 +93,7 @@ do + fi + + sed -e "s|@NAME@|${NAME}|g" \ ++ -e "s|@HOST@|${HOST}|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" \ -- cgit v1.2.3