- ah, merge from DEVEL

[packages/ffmpeg.git] / ffserver.init

diff --git a/ffserver.init b/ffserver.init
index f295c038eed87957dd3920cdefad0f346271951e..861a261739483fd4c1438abf1a7c52d141bd499b 100644 (file)
--- a/ffserver.init
+++ b/ffserver.init
@@ -27,20 +27,19 @@ else
        exit 0
 fi
 
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/ffserver ]; then
                msg_starting ffserver
-               daemon --fork ffserver
+               daemon --user ffserver ffserver
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ffserver
        else
                msg_already_running ffserver
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/ffserver ]; then
                # Stop daemons.
                msg_stopping ffserver
@@ -49,11 +48,19 @@ case "$1" in
        else
                msg_not_running ffserver
        fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status ffserver
@@ -65,6 +72,3 @@ case "$1" in
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh