From ad3e6002999e9b1e375e92b94c862b125a2ce86e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 29 Dec 2016 11:13:59 +0100 Subject: Adding -f, --force option in container auto command. Signed-off-by: Daniel Baumann --- lib/container/auto | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'lib/container/auto') diff --git a/lib/container/auto b/lib/container/auto index 69fe21b..45aa68f 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -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 -- cgit v1.2.3