summaryrefslogtreecommitdiffstats
path: root/lib/container/create
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-06 15:05:42 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2018-05-27 05:59:31 +0000
commit1e03e6dc46624f658239c3179875bd28b67fa91a (patch)
tree38731aa38565f40cb5419ea8e17af1af84f1f186 /lib/container/create
parentReleasing version 20180503. (diff)
downloadcompute-tools-1e03e6dc46624f658239c3179875bd28b67fa91a.tar.xz
compute-tools-1e03e6dc46624f658239c3179875bd28b67fa91a.zip
Switching to systemd-nspawn configuration files from /etc/container-tools/config.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xlib/container/create8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/container/create b/lib/container/create
index 2ffcfda..767a8c6 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -22,7 +22,7 @@ set -e
COMMAND="$(basename ${0})"
-CONFIG="/etc/container-tools/config"
+CONFIG="/etc/systemd/nspawn"
HOOKS="/etc/container-tools/hooks"
MACHINES="/var/lib/machines"
SCRIPTS="/usr/share/container-tools/scripts"
@@ -121,9 +121,9 @@ then
Usage
fi
-if [ -e "${CONFIG}/${NAME}.conf" ]
+if [ -e "${CONFIG}/${NAME}.nspawn" ]
then
- echo "'${NAME}': container already exists or ${CONFIG}/${NAME}.conf has not been removed" >&2
+ echo "'${NAME}': container already exists or ${CONFIG}/${NAME}.nspawn has not been removed" >&2
exit 1
fi
@@ -244,7 +244,7 @@ sed -e "s|@CNT_AUTO@|${CNT_AUTO}|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"
+/usr/share/container-tools/config/container.nspawn.in > "${CONFIG}/${NAME}.nspawn"
# Run
"${SCRIPTS}/${SCRIPT}" $(echo "${@}" | sed -e 's| -- | |')