summaryrefslogtreecommitdiffstats
path: root/lib/container/start
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-23 15:36:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-23 16:30:59 +0000
commit93d59c3176876b0990b27375458cf6518459bb07 (patch)
tree85403b3d9ac7f9df4b91195124b342dee81ec640 /lib/container/start
parentReleasing debian version 20180825-3. (diff)
downloadopen-infrastructure-compute-tools-93d59c3176876b0990b27375458cf6518459bb07.tar.xz
open-infrastructure-compute-tools-93d59c3176876b0990b27375458cf6518459bb07.zip
Merging upstream version 20190222.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/start')
-rwxr-xr-xlib/container/start23
1 files changed, 15 insertions, 8 deletions
diff --git a/lib/container/start b/lib/container/start
index ac0275e..a63c861 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -1,7 +1,6 @@
#!/bin/sh
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
#
# SPDX-License-Identifier: GPL-3.0+
#
@@ -20,10 +19,12 @@
set -e
+PROJECT="open-infrastructure"
+PROGRAM="container"
COMMAND="$(basename ${0})"
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
MACHINES="/var/lib/machines"
START="false"
@@ -89,7 +90,7 @@ Parameters ()
Usage ()
{
- echo "Usage: container ${COMMAND} -n|--name NAME [-f|--force]" >&2
+ echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force]" >&2
exit 1
}
@@ -102,11 +103,17 @@ fi
case "${NAME}" in
ALL)
- NAMES="$(container list --format shell --stopped)"
+ NAMES="$(${PROGRAM} list --format shell --stopped)"
for NAME in ${NAMES}
do
- container start --name ${NAME} ${OPTIONS_ALL} || true
+ case "${VERBOSE}" in
+ true)
+ echo "Starting container ${NAME}..."
+ ;;
+ esac
+
+ ${PROGRAM} start --name ${NAME} ${OPTIONS_ALL} || true
done
exit 0
@@ -459,7 +466,7 @@ fi
case "${SYSTEMCTL}" in
true)
- systemctl start container@${NAME}.service
+ systemctl start ${PROGRAM}@${NAME}.service
# FIXME start console .. after sleep? + configuration option
exit 0
;;