Changeset 32487 in vbox

Timestamp:

Sep 14, 2010 2:32:55 PM (14 years ago)

Author:

vboxsync

Message:

Linux installer: vboxweb-service updates

Location:

trunk/src/VBox/Installer/linux

Files:

• rpm/VirtualBox.tmpl.spec (modified) (4 diffs)
• vboxdrv.sh.in (modified) (3 diffs)
• vboxweb-service.sh.in (modified) (8 diffs)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -261 +261 @@
 %endif
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
-%{fillup_and_insserv -fy vboxdrv}
-%{fillup_and_insserv -fy vboxweb-service}
+%{fillup_and_insserv -fy vboxdrv vboxweb-service}
 %endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
@@ -311 +310 @@
 
 %preun
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
+%stop_on_removal vboxweb-service
+%endif
+%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
+%_preun_service vboxweb-service
+%endif
+%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
+if [ "$1" = 0 ]; then
+  /sbin/service vboxweb-service stop > /dev/null
+  /sbin/chkconfig --del vboxweb-service
+fi
+%endif
 # check for active VMs
 VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
 if [ -n "$VBOXSVC_PID" ]; then
-  # try graceful termination; terminate the webservice first
-  /etc/init.d/vboxweb-service stop || true
+  kill -USR1 $VBOXSVC_PID
   sleep 1
   if pidof VBoxSVC > /dev/null 2>&1; then
@@ -324 +334 @@
   fi
 fi
-
-%if %{?rpm_suse:1}%{!?rpm_suse:0}
-%stop_on_removal vboxweb-service
+%if %{?rpm_suse:1}%{!?rpm_suse:0}
 %stop_on_removal vboxdrv
 %endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
-%_preun_service vboxweb-service
 %_preun_service vboxdrv
 %endif
@@ -337 +344 @@
   /sbin/service vboxdrv stop > /dev/null
   /sbin/chkconfig --del vboxdrv
-  /sbin/service vboxweb-service stop > /dev/null
-  /sbin/chkconfig --del vboxweb-service
 %endif
   rm -f /etc/udev/rules.d/10-vboxdrv.rules

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -161 +161 @@
 start()
 {
-    begin_msg "Starting VirtualBox kernel module"
+    begin_msg "Starting VirtualBox kernel modules"
     if ! running vboxdrv; then
         if ! rm -f $DEVICE; then
@@ -213 +213 @@
 stop()
 {
-    begin_msg "Stopping VirtualBox kernel module"
+    begin_msg "Stopping VirtualBox kernel modules"
     if running vboxnetadp; then
         if ! rmmod vboxnetadp 2>/dev/null; then
@@ -307 +307 @@
     if ! $DODKMS install >> $LOG; then
       fail_msg "Failed, trying without DKMS"
-      begin_msg "Recompiling VirtualBox kernel module"
+      begin_msg "Recompiling VirtualBox kernel modules"
       if ! $BUILDVBOXDRV \
           --save-module-symvers /tmp/vboxdrv-Module.symvers \

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

@@ -28 +28 @@
 PATH=$PATH:/bin:/sbin:/usr/sbin
 DEBIAN=%DEBIAN%
+NOLSB=%NOLSB%
 
 [ -f /lib/lsb/init-functions ] || NOLSB=yes
@@ -91 +92 @@
     if [ -n "$NOLSB" ]; then
         start_daemon() {
-            daemon --user $1 $2 $3
+            usr="$1"
+            shift
+            daemon --user $usr $@
         }
         fail_msg() {
@@ -112 +115 @@
         usr="$1"
         shift
-        startproc -u "$usr" $@
+        su - $usr -c "$*"
     }
     if [ -n "$NOLSB" ]; then
@@ -135 +138 @@
         bin="$1"
         shift
-        start-stop-daemon --chuid "$usr" --start --exec "$bin" -- $@
+        start-stop-daemon --chuid $usr --start --exec $bin -- $@
     }
     killproc() {
@@ -160 +163 @@
         bin="$1"
         shift
-        start-stop-daemon --chuid "$usr" --start --exec "$bin" -- $@
+        start-stop-daemon --chuid $usr --start --exec $bin -- $@
     }
     killproc() {
@@ -185 +188 @@
     . /etc/rc.d/functions
     start_daemon() {
-        $@
+        usr="$1"
+        shift
+        su - $usr -c "$*"
         test $? -eq 0 && add_daemon rc.`basename $2`
     }
@@ -222 +227 @@
     fi
     start_daemon() {
-        # runuser
-        fail_msg "not supported on Slackware!"
-        return
-        $2 $3
+        usr="$1"
+        shift
+        su - $usr -c "$*"
     }
 fi
@@ -243 +247 @@
     fi
     start_daemon() {
-        # runuser
-        fail_msg "not supported on LFS!"
-        return
-        loadproc $2 $3
+        usr="$1"
+        shift
+        su - $usr -c "$*"
     }
     status() {