summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/upstream/0001-host-variable.patch42
-rw-r--r--debian/patches/upstream/0002-versioned-sort.patch12
3 files changed, 56 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e76f4e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream/0001-host-variable.patch
+upstream/0002-versioned-sort.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 <daniel.baumann@progress-linux.org>
+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" \
diff --git a/debian/patches/upstream/0002-versioned-sort.patch b/debian/patches/upstream/0002-versioned-sort.patch
new file mode 100644
index 0000000..1f76b90
--- /dev/null
+++ b/debian/patches/upstream/0002-versioned-sort.patch
@@ -0,0 +1,12 @@
+diff -Naurp open-infrastructure-compute-tools.orig/libexec/container/list open-infrastructure-compute-tools/libexec/container/list
+--- open-infrastructure-compute-tools.orig/libexec/container/list 2023-02-14 21:43:48.782723940 +0100
++++ open-infrastructure-compute-tools/libexec/container/list 2023-04-16 08:04:02.277215515 +0200
+@@ -327,7 +327,7 @@ esac
+
+ if ls "${MACHINES}"/* > /dev/null 2>&1
+ then
+- CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 \( -type d -or -type l \) -and -not -name 'lost+found' -printf '%P\n' | sort)"
++ CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 \( -type d -or -type l \) -and -not -name 'lost+found' -printf '%P\n' | sort -V)"
+ fi
+
+ for CONTAINER in ${CONTAINERS}