summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-04-16 06:05:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-04-16 06:05:12 +0000
commitff556ab71056cae54f2e5d3f1a0c838556f0c70c (patch)
tree40c60fec1113967fcb0ff8fe20a811327cede825
parentReleasing debian version 20221223-4. (diff)
downloadopen-infrastructure-compute-tools-ff556ab71056cae54f2e5d3f1a0c838556f0c70c.tar.xz
open-infrastructure-compute-tools-ff556ab71056cae54f2e5d3f1a0c838556f0c70c.zip
Cherry-picking patch to use versioned sort in container list.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/upstream/0002-versioned-sort.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
index efde17d..e76f4e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
upstream/0001-host-variable.patch
+upstream/0002-versioned-sort.patch
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}