summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-25 12:46:14 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-25 12:46:14 +0000
commit33ecffa4bbabc017e91d1f3345fa305f668251d4 (patch)
tree8398f1dbc3f9c3cb88c48aea50fce6892795e044
parentRemoving container limit command for LTS version. (diff)
downloadcompute-tools-33ecffa4bbabc017e91d1f3345fa305f668251d4.tar.xz
compute-tools-33ecffa4bbabc017e91d1f3345fa305f668251d4.zip
Removing -f|--force option in container stop command for LTS version.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xlib/container/stop20
-rw-r--r--share/man/container-stop.1.txt6
2 files changed, 3 insertions, 23 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}
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 7531f1c..8b864d6 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -44,18 +44,12 @@ The following container options are available:
*-n, --name='NAME'*::
Specify container name.
-*-f, --force*::
- Instead of running the proper shutdown sequence, terminate all processes of the container imediatly.
-
EXAMPLES
--------
*Shutdown example.net container:*::
sudo container stop -n example.net
-*Immediately stop example.net container:*::
- sudo container stop -n example.net -f
-
SEE ALSO
--------