summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-07-31 18:39:18 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-08-04 13:35:55 +0000
commit628d2ad4bf886ee792b6ea91f52aed708dae8702 (patch)
tree3c5916eabca0a64230549335aed39bb373da2c0b /lib
parentSorting container configuration file. (diff)
downloadcompute-tools-628d2ad4bf886ee792b6ea91f52aed708dae8702.tar.xz
compute-tools-628d2ad4bf886ee792b6ea91f52aed708dae8702.zip
Adding support for user namespace.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xlib/container/create1
-rwxr-xr-xlib/container/start12
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/container/create b/lib/container/create
index 2d66436..cb51871 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -188,6 +188,7 @@ sed -e "s|@CNT_AUTO@|${CNT_AUTO}|g" \
-e "s|@LINK_JOURNAL@|no|g" \
-e "s|@MACHINE@|${NAME}|g" \
-e "s|@NETWORK_VETH_EXTRA@|${NETWORK_VETH_EXTRA}|g" \
+ -e "s|@PRIVATE_USERS@|no|g" \
-e "s|@REGISTER@|yes|g" \
/usr/share/container-tools/config/container.conf.in > "${CONFIG}/${NAME}.conf"
diff --git a/lib/container/start b/lib/container/start
index 41e8f72..5191ae2 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -312,6 +312,18 @@ EOF
;;
esac
+ PRIVATE_USERS="$(awk -F= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
+
+ case "${PRIVATE_USERS}" in
+ yes)
+ PRIVATE_USERS="--private-users=yes"
+ ;;
+
+ *)
+ PRIVATE_USERS="--private-users=no"
+ ;;
+ esac
+
REGISTER="$(awk -F= '/^register=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo yes)"
case "${REGISTER}" in