diff options
author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2018-05-27 07:24:43 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2018-05-27 08:55:24 +0000 |
commit | 5e1ac4373414852fafc23f6250126bd4a2c1147a (patch) | |
tree | fb8e49939c7495595977d1a48b4b04d0b661af98 /lib/container | |
parent | Updating documentation for multiple commands in a row. (diff) | |
download | compute-tools-5e1ac4373414852fafc23f6250126bd4a2c1147a.tar.xz compute-tools-5e1ac4373414852fafc23f6250126bd4a2c1147a.zip |
Calling shell in container enter command directly, replacing container-nsenter helper program.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'lib/container')
-rwxr-xr-x | lib/container/enter | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/container/enter b/lib/container/enter index faf5d35..f7551fe 100755 --- a/lib/container/enter +++ b/lib/container/enter @@ -104,14 +104,7 @@ do done # Run -if [ -e "${MACHINES}/${NAME}/usr/bin/container-nsenter" ] -then - OPTIONS="/usr/bin/container-nsenter" -else - OPTIONS="" -fi - -nsenter --target ${LEADER} --mount --uts --ipc --net --pid --root --wd=/root ${OPTIONS} +nsenter --target ${LEADER} --mount --uts --ipc --net --pid --root --wd=/root /usr/bin/script -c "/bin/bash -l" -q /dev/null # Post hooks for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" |