diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-02-09 16:18:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-02-09 16:18:39 +0000 |
| commit | 4abccc2c18bcc237324071298c0f6c75e14ef7c0 (patch) | |
| tree | 3d7b8e5b300c926d51be6c4ae496c672f49156ab /lib/container/remove | |
| parent | Releasing debian version 20201030-1. (diff) | |
| download | open-infrastructure-compute-tools-4abccc2c18bcc237324071298c0f6c75e14ef7c0.tar.xz open-infrastructure-compute-tools-4abccc2c18bcc237324071298c0f6c75e14ef7c0.zip | |
Merging upstream version 20210101.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/remove')
| -rwxr-xr-x | lib/container/remove | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/container/remove b/lib/container/remove index 820e45e..75ebd60 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2020 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # @@ -126,12 +126,6 @@ case "${NAME}" in for NAME in ${NAMES} do - case "${VERBOSE}" in - true) - echo "Removing container ${NAME}..." - ;; - esac - ${PROGRAM} remove --name ${NAME} ${OPTIONS_ALL} || true done @@ -238,9 +232,21 @@ then fi # Run +case "${VERBOSE}" in + true) + echo -n "Removing container ${NAME}..." + ;; +esac + rm --preserve-root --one-file-system -rf ${RM_OPTIONS} "${MACHINES}/${NAME}" rm -f ${RM_OPTIONS} "${CONFIG}/${NAME}.conf" +case "${VERBOSE}" in + true) + echo " done." + ;; +esac + # Post hooks for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" do |