From 93d59c3176876b0990b27375458cf6518459bb07 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 23 Feb 2019 16:36:10 +0100 Subject: Merging upstream version 20190222. Signed-off-by: Daniel Baumann --- lib/container/stop | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'lib/container/stop') diff --git a/lib/container/stop b/lib/container/stop index d996282..3a0de2a 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -1,7 +1,6 @@ #!/bin/sh -# container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2018 Daniel Baumann +# Copyright (C) 2014-2019 Daniel Baumann # # 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" CLEAN="false" @@ -83,7 +84,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 } @@ -117,11 +118,17 @@ fi case "${NAME}" in ALL) - NAMES="$(container list --format shell --started)" + NAMES="$(${PROGRAM} list --format shell --started)" for NAME in ${NAMES} do - container stop --name ${NAME} ${OPTIONS_ALL} || true + case "${VERBOSE}" in + true) + echo "Stopping container ${NAME}..." + ;; + esac + + ${PROGRAM} stop --name ${NAME} ${OPTIONS_ALL} || true done exit 0 -- cgit v1.2.3