From 5e1ac4373414852fafc23f6250126bd4a2c1147a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 27 May 2018 09:24:43 +0200
Subject: Calling shell in container enter command directly, replacing
 container-nsenter helper program.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 lib/container/enter | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'lib/container/enter')

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}"
-- 
cgit v1.2.3