summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-04-11 19:36:00 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-04-16 10:21:37 +0000
commit59f8329c73894cc3870f99a9e967de88db0e6371 (patch)
tree9dc49173e4c6b89093a21056accc755c4ad42ee5
parentAdding manpage symlinks for container script shortcut symlinks. (diff)
downloadcompute-tools-59f8329c73894cc3870f99a9e967de88db0e6371.tar.xz
compute-tools-59f8329c73894cc3870f99a9e967de88db0e6371.zip
Renaming container stop command option -k, --kill to -f, --force for consistency.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xlib/container/stop12
-rw-r--r--share/man/container-stop.1.txt4
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/container/stop b/lib/container/stop
index a11c155..cd3de10 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -24,8 +24,8 @@ MACHINES="/var/lib/machines"
Parameters ()
{
- LONG_OPTIONS="name:,kill"
- OPTIONS="n:,k"
+ LONG_OPTIONS="name:,force"
+ OPTIONS="n:,f"
PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
@@ -45,8 +45,8 @@ Parameters ()
shift 2
;;
- -k|--kill)
- KILL="true"
+ -f|--force)
+ FORCE="true"
;;
--)
@@ -64,7 +64,7 @@ Parameters ()
Usage ()
{
- echo "Usage: container ${COMMAND} -n|--name NAME [-k|--kill]" >&2
+ echo "Usage: container ${COMMAND} -n|--name NAME [-f|--force]" >&2
exit 1
}
@@ -93,7 +93,7 @@ case "${STATE}" in
;;
esac
-case "${KILL}" in
+case "${FORCE}" in
true)
MODE="terminate"
;;
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 8f368cf..5f8356d 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -44,7 +44,7 @@ The following container options are available:
*-n, --name='NAME'*::
Specify container name.
-*-k, --kill*::
+*-f, --force*::
Instead of running the proper shutdown sequence, terminate all processes of the container imediatly.
@@ -54,7 +54,7 @@ EXAMPLES
sudo container stop -n example.net
*Immediately stop example.net container:*::
- sudo container stop -n example.net -k
+ sudo container stop -n example.net -f
SEE ALSO