diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2016-08-02 13:00:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2016-08-04 13:35:56 +0000 |
| commit | cb05fd76cd7099eac45d2811cea730a4ed0b6e26 (patch) | |
| tree | ecc8c92a64c2c7e901a2f2d15badfdbabad591cb | |
| parent | Adding support for user namespace. (diff) | |
| download | compute-tools-cb05fd76cd7099eac45d2811cea730a4ed0b6e26.tar.xz compute-tools-cb05fd76cd7099eac45d2811cea730a4ed0b6e26.zip | |
Adding -v, --verbose option to container remove command.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
| -rwxr-xr-x | lib/container/remove | 25 | ||||
| -rw-r--r-- | share/man/container-remove.1.txt | 3 |
2 files changed, 23 insertions, 5 deletions
diff --git a/lib/container/remove b/lib/container/remove index e4bb20c..843e9c3 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -25,8 +25,8 @@ MACHINES="/var/lib/machines" Parameters () { - LONG_OPTIONS="name:,force," - OPTIONS="n:,f," + LONG_OPTIONS="name:,force,verbose," + OPTIONS="n:,f,v," PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})" @@ -51,6 +51,11 @@ Parameters () shift 1 ;; + -f|--verbose) + VERBOSE="true" + shift 1 + ;; + --) shift 1 break @@ -66,7 +71,7 @@ Parameters () Usage () { - echo "Usage: container ${COMMAND} -n|--name NAME [-f|--force]" >&2 + echo "Usage: container ${COMMAND} -n|--name NAME [-f|--force] [-v|--verbose]" >&2 exit 1 } @@ -113,6 +118,16 @@ case "${FORCE}" in ;; esac +case "${VERBOSE}" in + true) + RM_OPTIONS="--verbose" + ;; + + *) + RM_OPTIONS="" + ;; +esac + # data if [ -e "${CONFIG}/${NAME}.conf" ] then @@ -133,5 +148,5 @@ then fi # Run -rm --preserve-root --one-file-system -rf "${MACHINES}/${NAME}" -rm -f "${CONFIG}/${NAME}.conf" +rm --preserve-root --one-file-system -rf ${RM_OPTIONS} "${MACHINES}/${NAME}" +rm -f ${RM_OPTIONS} "${CONFIG}/${NAME}.conf" diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt index cb9b77f..cad779f 100644 --- a/share/man/container-remove.1.txt +++ b/share/man/container-remove.1.txt @@ -47,6 +47,9 @@ The following container options are available: *-f, --force*:: Do not prompt before removal. +*-v, --verbose*:: + Explain what is being done. + EXAMPLES -------- |