summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-07-21 18:00:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-10-02 12:20:18 +0000
commit2b89937f3d52b388fadeeaed709dc535d5af9ce7 (patch)
treefb3558d81a3a7807ccdadde021d38e1ba968fada
parentReleasing debian version 20220704-1. (diff)
downloadopen-infrastructure-compute-tools-2b89937f3d52b388fadeeaed709dc535d5af9ce7.tar.xz
open-infrastructure-compute-tools-2b89937f3d52b388fadeeaed709dc535d5af9ce7.zip
Merging upstream version 20220721.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt10
-rw-r--r--VERSION.txt2
-rwxr-xr-xlibexec/container/info14
3 files changed, 20 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 42ed6f1..ac686db 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,13 @@
+2022-07-21 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20220721.
+
+ [ Daniel Baumann ]
+ * Returning all ip addresses in cnt info command.
+ * Correcting container info command to report IP addresses of stopped container.
+ * Handling multiple IP addresses in container info command the same way for stopped containers as for started ones.
+ * Adding lazy detection in container info command for Debian 12 (booworm).
+
2022-07-04 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20220704.
diff --git a/VERSION.txt b/VERSION.txt
index d929766..ace4919 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20220704
+20220721
diff --git a/libexec/container/info b/libexec/container/info
index 699a253..0888cc8 100755
--- a/libexec/container/info
+++ b/libexec/container/info
@@ -167,6 +167,10 @@ case "${VERSION_BASH}" in
OS="Debian 11 (bullseye)"
;;
+ 5.2*)
+ OS="Debian 12 (bookworm)"
+ ;;
+
*)
OS="n/a"
;;
@@ -174,16 +178,16 @@ esac
case "${STATUS}" in
started)
- IP="$(cnt run -n ${NAME} -- hostname -I | awk '{ print $1 }')"
+ IP="$(cnt run -n ${NAME} -- hostname -I)"
;;
*)
- if ls "${MACHINES}/${CONTAINER}/etc/systemd/network"/*.network > /dev/null 2>&1
+ if ls "${MACHINES}/${NAME}/etc/systemd/network"/*.network > /dev/null 2>&1
then
- IP="$(awk -FAddress= '/^Address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/systemd/network/*.network | head -n1)"
- elif [ -e "${MACHINES}/${CONTAINER}/etc/network/interfaces" ]
+ IP="$(awk -FAddress= '/^Address/ { printf "%s ", $2 }' ${MACHINES}/${NAME}/etc/systemd/network/*.network)"
+ elif [ -e "${MACHINES}/${NAME}/etc/network/interfaces" ]
then
- IP="$(awk '/address/ { print $2 }' ${MACHINES}/${CONTAINER}/etc/network/interfaces | head -n1)"
+ IP="$(awk '/address/ { printf "%s ", $2 }' ${MACHINES}/${NAME}/etc/network/interfaces)"
fi
IP="${IP:-n/a}"