diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-04-30 22:11:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-04-30 22:11:02 +0000 |
| commit | dd79bec09e9bc9cb23077e099ce0fc78cf24ac1a (patch) | |
| tree | 36cea4cd330633da69e3cbf90873974791295b1d /libexec | |
| parent | Releasing progress-linux version 20220428-1. (diff) | |
| download | open-infrastructure-compute-tools-dd79bec09e9bc9cb23077e099ce0fc78cf24ac1a.tar.xz open-infrastructure-compute-tools-dd79bec09e9bc9cb23077e099ce0fc78cf24ac1a.zip | |
Merging upstream version 20220430.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libexec')
| -rwxr-xr-x | libexec/container/enter | 2 | ||||
| -rwxr-xr-x | libexec/container/list | 2 |
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 |