From ff556ab71056cae54f2e5d3f1a0c838556f0c70c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 16 Apr 2023 08:05:12 +0200 Subject: Cherry-picking patch to use versioned sort in container list. Signed-off-by: Daniel Baumann --- debian/patches/series | 1 + debian/patches/upstream/0002-versioned-sort.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 debian/patches/upstream/0002-versioned-sort.patch 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} -- cgit v1.2.3