[libvirt] [PATCH 1/3] libvirt-guests: detect invalid arguments

Reject extra arguments. Return the correct status for unknown arguments, as mandated by https://fedoraproject.org/wiki/Packaging/SysVInitScript Add --help, as a permitted extension. * daemon/libvirt-guests.init.in (usage): New function. Use it in more places, and return correct value. --- daemon/libvirt-guests.init.in | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/daemon/libvirt-guests.init.in b/daemon/libvirt-guests.init.in index d2ec96a..3a5b205 100644 --- a/daemon/libvirt-guests.init.in +++ b/daemon/libvirt-guests.init.in @@ -282,8 +282,21 @@ gueststatus() { done } +# usage [val] +# Display usage string, then exit with VAL (defaults to 2). +usage() { + echo $"Usage: $0 {start|stop|restart|force-reload|gueststatus|shutdown}" + exit ${1-2} +} + # See how we were called. +if test $# != 1; then + usage +fi case "$1" in + --help) + usage 0 + ;; start|stop|gueststatus) $1 ;; @@ -304,8 +317,7 @@ case "$1" in stop ;; *) - echo $"Usage: $0 {start|stop|restart|force-reload|gueststatus|shutdown}" - exit 3 + usage ;; esac exit $RETVAL -- 1.7.2