From 4abccc2c18bcc237324071298c0f6c75e14ef7c0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 9 Feb 2021 17:18:31 +0100 Subject: Merging upstream version 20210101. Signed-off-by: Daniel Baumann --- lib/container/start | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'lib/container/start') diff --git a/lib/container/start b/lib/container/start index 6309fb1..30aee53 100755 --- a/lib/container/start +++ b/lib/container/start @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2020 Daniel Baumann +# Copyright (C) 2014-2021 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -77,6 +77,9 @@ Parameters () -v|--verbose) VERBOSE="true" + shift 1 + + OPTIONS_ALL="${OPTIONS_ALL} --verbose" ;; --) @@ -114,12 +117,6 @@ case "${NAME}" in for NAME in ${NAMES} do - case "${VERBOSE}" in - true) - echo "Starting container ${NAME}..." - ;; - esac - ${PROGRAM} start --name ${NAME} ${OPTIONS_ALL} || true done @@ -516,6 +513,19 @@ case "${START}" in *) # Run + + case "${VERBOSE}" in + true) + echo -n "Starting container ${NAME}..." + ;; + esac + ${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER} + + case "${VERBOSE}" in + true) + echo " done." + ;; + esac ;; esac -- cgit v1.2.3