X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvshelper;h=1d589075b6f37d5c2d17b30056d1fc2b7df716a0;hb=f21bcfd6e19b055c89bb4c5d66511dda1cde9449;hp=f642aa558e5c6031f33d7f2e42cdb6ac8d8fc164;hpb=a8d292acbadef48cd3f2062015a72fc0f267e96a;p=util-vserver.git diff --git a/util-vserver/scripts/vshelper b/util-vserver/scripts/vshelper index f642aa5..1d58907 100755 --- a/util-vserver/scripts/vshelper +++ b/util-vserver/scripts/vshelper @@ -52,7 +52,7 @@ function doInternalMethod case "$method" in (restart) case "$ACTION" in - (restart*) + (restart) logging $"Restarting vserver '$VSERVER'" execute $_VSERVER "$VSERVER" restart ;; @@ -63,6 +63,8 @@ function doInternalMethod (swsusp) ## TODO: any senseful action here? Perhaps shutdown scheduler for it? exit 0 + ;; + (restart2) ;; (*) warning $"Unknown action '$ACTION' for vserver '$VSERVER'" exit 1 @@ -111,6 +113,15 @@ function doDefaultMethod #=========== +if ! tty -s; then + findObject -e _VS_LOGFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null + findObject -e _VS_ERRFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null + + exec >>$_VS_LOGFILE + exec 2>>$_VS_ERRFILE +fi + +logging "$(date): vshelper $*" test "$1" != '--version' || showVersion test "$1" != '--help' || showHelp @@ -118,7 +129,6 @@ test "$#" -ge 2 || panic $"vshelper called with missing arguments; try '--help' for more information" vshelper.isEnabled || exit 0 -logging "$(date): vshelper $*" set -eu