summaryrefslogtreecommitdiffstats
path: root/bin/container
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-06-29 11:39:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-06-29 11:39:16 +0000
commit251870158b34972626130b0f20c53b4ee321849a (patch)
tree4172459bf6c9d8085c9ea5d1c1c3d4fca736e179 /bin/container
parentReleasing debian version 20210411-1. (diff)
downloadopen-infrastructure-compute-tools-251870158b34972626130b0f20c53b4ee321849a.tar.xz
open-infrastructure-compute-tools-251870158b34972626130b0f20c53b4ee321849a.zip
Merging upstream version 20210628.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'bin/container')
-rwxr-xr-xbin/container10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/container b/bin/container
index c3748d9..3e329c9 100755
--- a/bin/container
+++ b/bin/container
@@ -66,12 +66,16 @@ do
else
case "${COMMAND}" in
create|cr|move|mv|remove|rm|restart|rt|start|s|stop|t)
- USER="${SUDO_USER:-${USER}}"
+ if [ -z "${CONTAINER_USER}" ]
+ then
+ CONTAINER_USER="${SUDO_USER:-${USER}}"
+ fi
+
DATE="$(date +%Y-%m-%d\ %H:%M:%S)"
HOST="$(hostname -f 2> /dev/null || hostname)"
# logfile
- echo "${DATE} ${HOST} ${USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
+ echo "${DATE} ${HOST} ${CONTAINER_USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
# irc
if [ -e /usr/bin/irk ] && [ -e "/etc/${SOFTWARE}.conf" ]
@@ -82,7 +86,7 @@ do
then
for TARGET in ${IRK_TARGETS}
do
- irk ${TARGET} "\x0300${USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}"
+ irk ${TARGET} "\x0300${CONTAINER_USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}"
done
fi
fi