summaryrefslogtreecommitdiffstats
path: root/libexec/container
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-30 22:10:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-30 22:10:58 +0000
commit5e8cdc8f88a9b9684cc6dc02b1d04ad52d966fe4 (patch)
tree196f1feb7861b71b41d0836231ff6dbc537cf371 /libexec/container
parentAdding upstream version 20220428. (diff)
downloadopen-infrastructure-compute-tools-5e8cdc8f88a9b9684cc6dc02b1d04ad52d966fe4.tar.xz
open-infrastructure-compute-tools-5e8cdc8f88a9b9684cc6dc02b1d04ad52d966fe4.zip
Adding upstream version 20220430.upstream/20220430
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-xlibexec/container/enter2
-rwxr-xr-xlibexec/container/list2
2 files changed, 2 insertions, 2 deletions
diff --git a/libexec/container/enter b/libexec/container/enter
index 604d714..f1dae7f 100755
--- a/libexec/container/enter
+++ b/libexec/container/enter
@@ -111,7 +111,7 @@ done
SSH_CLIENT="${SSH_CLIENT:-127.0.0.1 0 0}"
# Run
-nsenter --all --target "${LEADER}" --wd="${MACHINES}/${NAME}/root" /usr/bin/script -c "LC_ALL=C.UTF-8 /bin/bash -l" -q /dev/null
+nsenter --all --target "${LEADER}" --wd="${MACHINES}/${NAME}/root" /usr/bin/script -c "LC_ALL=C.UTF-8 SSH_CLIENT=\"${SSH_CLIENT}\" /bin/bash -l" -q /dev/null
case "${SSH_CLIENT}" in
127.0.0.1*)
diff --git a/libexec/container/list b/libexec/container/list
index c112cc8..2600bab 100755
--- a/libexec/container/list
+++ b/libexec/container/list
@@ -377,7 +377,7 @@ do
*)
LEADER="$(machinectl status ${CONTAINER} | awk '/Leader: / { print $2 }')"
- ADDRESS="$(nsenter --all --target "${LEADER}" /bin/hostname -I | sed -e 's|\r$||' | awk '{ print $1 }')"
+ ADDRESS="$(nsenter --all --target "${LEADER}" /bin/hostname -I)"
;;
esac