diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2017-01-04 10:41:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2017-01-04 10:42:45 +0000 |
| commit | e81986238b9faadd633c22883bd4aa6152111c00 (patch) | |
| tree | bd83e33713d27157ea8e8100ddc50ad9fd1844b7 /lib/container/auto | |
| parent | Releasing debian version 20161220-1. (diff) | |
| download | open-infrastructure-compute-tools-e81986238b9faadd633c22883bd4aa6152111c00.tar.xz open-infrastructure-compute-tools-e81986238b9faadd633c22883bd4aa6152111c00.zip | |
Merging upstream version 20170101.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'lib/container/auto')
| -rwxr-xr-x | lib/container/auto | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/container/auto b/lib/container/auto index 969ce0a..45aa68f 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,8 +25,8 @@ HOOKS="/etc/container-tools/hooks" Parameters () { - GETOPT_LONGOPTIONS="start,stop," - GETOPT_OPTIONS="s,t," + GETOPT_LONGOPTIONS="force,start,stop," + GETOPT_OPTIONS="f,s,t," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -41,6 +41,11 @@ Parameters () while true do case "${1}" in + -f|--force) + FORCE="true" + shift 1 + ;; + -s|--start) ACTION="start" shift 1 @@ -66,7 +71,7 @@ Parameters () Usage () { - echo "Usage: container ${COMMAND} -s|--start -t|--stop" >&2 + echo "Usage: container ${COMMAND} -f|--force -s|--start -t|--stop" >&2 exit 1 } @@ -89,13 +94,21 @@ do done # Run +OPTIONS="" + +case "${FORCE}" in + true) + OPTIONS="${OPTIONS} -f" + ;; +esac + for FILE in "${CONFIG}"/*.conf do if grep -Eqs "^ *cnt.auto=true" "${FILE}" || grep -Eqs "^ *cnt.auto=${HOST}" "${FILE}" then CONTAINER="$(basename ${FILE} .conf)" - cnt ${ACTION} -n ${CONTAINER} || true + cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true fi done |