From bfcba376f9e666de4fa3a42aa3198a3a316d6a0a Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 26 Mar 2004 09:03:52 +0000 Subject: [PATCH] ignore 'restart2' event; this seems to be issued at vserver *start* added support for a logfile enable logfile-logging when invoked from kernel (no tty) git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1385 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vshelper | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/util-vserver/scripts/vshelper b/util-vserver/scripts/vshelper index f642aa5..0bc4e10 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 + findFile _VS_LOGFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null + findFile _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 -- 1.8.1.5