Changeset 32326 in vbox for trunk

Timestamp:

Sep 8, 2010 3:58:41 PM (14 years ago)

Author:

vboxsync

Message:

Linux .run installer: try to terminate VBoxSVC if necessary; check for running VBoxSVC instances before uninstalling; handle the vboxweb-service

Location:

trunk/src/VBox/Installer/linux

Files:

trunk/src/VBox/Installer/linux/install.sh

-              r32183
+              r32326
 info "VirtualBox Version $VERSION r$SVNREV ($BUILD) installer"
+check_root      # Make sure that we were invoked as root...
+check_running   # ... and that no copy of VirtualBox was running at the time.
+# Make sure that we were invoked as root...
+check_root
 # Set up logging before anything else
 create_log $LOG
+# Now stop the web service otherwise it will keep VBoxSVC running
+stop_init_script vboxweb-service
+# Now check if no VBoxSVC daemon is running
+check_running
 log "VirtualBox $VERSION r$SVNREV installer, built $BUILD."
 log ""
 …
             RC_SCRIPT=1
         fi
+        start_init_script vboxweb-service
         log ""
         log "End of the output from the Linux kernel build system."

-              r31664
+              r32326
 check_running() {
+    if pidof VBoxSVC > /dev/null 2>&1; then
+        echo 1>&2 "A copy of VirtualBox is currently running.  Please close it and try again."
+        abort "Please note that it can take up to ten seconds for VirtualBox to finish running."
+    VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null`
+    if [ -n "$VBOXSVC_PID" ]; then
+        kill -USR1 $VBOXSVC_PID
+        sleep 1
+        if pidof VBoxSVC > /dev/null 2>&1; then
+            echo 1>&2 "A copy of VirtualBox is currently running.  Please close it and try again."
+            abort "Please note that it can take up to ten seconds for VirtualBox to finish running."
+        fi
     fi
+}

-              r32183
+              r32326
 fi
+check_root
 [ -z "$DKMS"       ]    && DKMS=`which dkms 2> /dev/null`
 [ -z "$CONFIG_DIR" ]    && CONFIG_DIR="/etc/vbox"
 …
 [ -z "$CONFIG_FILES" ]  && CONFIG_FILES="filelist"
 [ -z "$DEFAULT_FILES" ] && DEFAULT_FILES=`pwd`/deffiles
-# Terminate Server and VBoxNetDHCP if running
-terminate_proc VBoxSVC
-terminate_proc VBoxNetDHCP
 # Find previous installation
 …
 # Stop the web service
 stop_init_script vboxweb-service
+# Do this check here after we terminated the web service
+check_running
+# Terminate VBoxNetDHCP if running
+terminate_proc VBoxNetDHCP
 delrunlevel vboxweb-service > /dev/null 2>&1
 remove_init_script vboxweb-service

Note: See TracChangeset for help on using the changeset viewer.