diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-10-25 13:13:01 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-10-25 13:13:01 +0000 |
commit | 07357f5916ea7380a6008b6e29d50c1889311491 (patch) | |
tree | d9f0c5fa35941b7484aaf575cc1aac90d7ac4b20 /lib/container/stop | |
parent | Releasing debian version 20160801-1. (diff) | |
download | open-infrastructure-compute-tools-07357f5916ea7380a6008b6e29d50c1889311491.tar.xz open-infrastructure-compute-tools-07357f5916ea7380a6008b6e29d50c1889311491.zip |
Merging upstream version 20161101.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rwxr-xr-x | lib/container/stop | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/container/stop b/lib/container/stop index ec24d51..ba8960d 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -27,8 +27,8 @@ CLEAN="false" Parameters () { - LONG_OPTIONS="name:,force,clean," - OPTIONS="n:,f," + LONG_OPTIONS="name:,clean," + OPTIONS="n:," PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})" @@ -48,10 +48,6 @@ Parameters () shift 2 ;; - -f|--force) - FORCE="true" - ;; - --clean) # internal option CLEAN="true" @@ -170,15 +166,5 @@ case "${STATE}" in ;; esac -case "${FORCE}" in - true) - MODE="terminate" - ;; - - *) - MODE="poweroff" - ;; -esac - # Run -machinectl ${MODE} ${NAME} +machinectl poweroff ${NAME} |