Changeset 32470 in vbox

Timestamp:

Sep 14, 2010 10:18:24 AM (14 years ago)

Author:

vboxsync

Message:

Linux installer: vboxweb-service updates

File:

• trunk/src/VBox/Installer/linux/vboxweb-service.sh.in (modified) (10 diffs)

trunk/src/VBox/Installer/linux/vboxweb-service.sh.in

@@ -90 +90 @@
     . /etc/init.d/functions
     if [ -n "$NOLSB" ]; then
+        start_daemon() {
+            daemon --user $1 $2 $3
+        }
         fail_msg() {
             echo_failure
@@ -106 +109 @@
 if [ "$system" = "suse" ]; then
     . /etc/rc.status
-    daemon() {
-        startproc ${1+"$@"}
+    start_daemon() {
+        usr="$1"
+        shift
+        startproc -u "$usr" $@
     }
     if [ -n "$NOLSB" ]; then
@@ -125 +130 @@
 
 if [ "$system" = "debian" ]; then
-    daemon() {
-        start-stop-daemon --background --chuid "$1" --start --exec $2 -- $3
+    start_daemon() {
+        usr="$1"
+        shift
+        bin="$1"
+        shift
+        start-stop-daemon --background --chuid "$usr" --start --exec "$bin" -- $@
     }
     killproc() {
@@ -146 +155 @@
 if [ "$system" = "gentoo" ]; then
     . /sbin/functions.sh
-    daemon() {
-        start-stop-daemon --start --exec $2 -- $3
+    start_daemon() {
+        usr="$1"
+        shift
+        bin="$1"
+        shift
+        start-stop-daemon --background --chuid "$usr" --start --exec "$bin" -- $@
     }
     killproc() {
@@ -171 +184 @@
     USECOLOR=yes
     . /etc/rc.d/functions
-    daemon() {
+    start_daemon() {
         $@
         test $? -eq 0 && add_daemon rc.`basename $2`
@@ -193 +206 @@
 
 if [ "$system" = "slackware" ]; then
-    daemon() {
-        $2 $3
-    }
     killproc() {
         killall $1
@@ -211 +221 @@
         }
     fi
+    start_daemon() {
+        # runuser
+        fail_msg "not supported on Slackware!"
+        return
+        $2 $3
+    }
 fi
 
 if [ "$system" = "lfs" ]; then
     . /etc/rc.d/init.d/functions
-    daemon() {
+    if [ -n "$NOLSB" ]; then
+        fail_msg() {
+            echo_failure
+        }
+        succ_msg() {
+            echo_ok
+        }
+        begin_msg() {
+            echo $1
+        }
+    fi
+    start_daemon() {
+        # runuser
+        fail_msg "not supported on LFS!"
+        return
         loadproc $2 $3
     }
-    if [ -n "$NOLSB" ]; then
-        fail_msg() {
-            echo_failure
-        }
-        succ_msg() {
-            echo_ok
-        }
-        begin_msg() {
-            echo $1
-        }
-    fi
     status() {
         statusproc $1
@@ -250 +269 @@
 vboxdrvrunning() {
     lsmod | grep -q "vboxdrv[^_-]"
+}
+
+check_single_user() {
+    if [ -n "$2" ]; then
+        fail_msg "VBOXWEB_USER must not contain multiple users!"
+        exit 1
+    fi
 }
 
@@ -256 +282 @@
         [ -z "$VBOXWEB_USER" ] && exit 0
         begin_msg "Starting VirtualBox web service";
+        check_single_user $VBOXWEB_USER
         vboxdrvrunning || {
             fail_msg "VirtualBox kernel module not loaded!"
@@ -268 +295 @@
         [ -n "$VBOXWEB_KEEPALIVE" ]      && PARAMS="$PARAMS -k $VBOXWEB_KEEPALIVE"
         [ -n "$VBOXWEB_LOGFILE" ]        && PARAMS="$PARAMS -F $VBOXWEB_LOGFILE"
-        for u in $VBOXWEB_USER; do
-            daemon $u $binary $PARAMS > /dev/null 2>&1
-        done
+        start_daemon $VBOXWEB_USER $binary $PARAMS > /dev/null 2>&1
         PID=`pidof $binary 2>/dev/null`
         [ -n "$PID" ] && echo "$PID" > $PIDFILE