diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-26 03:57:17 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-26 03:57:33 +0000 |
| commit | e7265143908a6a85f91306a14293fab2861efbd9 (patch) | |
| tree | e27ee8e570d38d6280b095260a9fdd19e75da715 /libexec/container/list | |
| parent | Releasing debian version 20210725-1. (diff) | |
| download | open-infrastructure-compute-tools-e7265143908a6a85f91306a14293fab2861efbd9.tar.xz open-infrastructure-compute-tools-e7265143908a6a85f91306a14293fab2861efbd9.zip | |
Merging upstream version 20210726.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libexec/container/list')
| -rwxr-xr-x | libexec/container/list | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libexec/container/list b/libexec/container/list index 3ef6e49..6567afb 100755 --- a/libexec/container/list +++ b/libexec/container/list @@ -368,7 +368,16 @@ do case "${STATE}" in started) - ADDRESS="$(cnt run -n ${CONTAINER} -- hostname -I | sed -e 's|\r$||' | awk '{ print $1 }')" + case "${FORMAT}" in + shell|sh) + ;; + + *) + LEADER="$(machinectl status ${CONTAINER} | awk '/Leader: / { print $2 }')" + ADDRESS="$(nsenter --all --target "${LEADER}" /bin/hostname -I | sed -e 's|\r$||' | awk '{ print $1 }')" + ;; + esac + ADDRESS="${ADDRESS:-none}" ;; |