Changeset 42119 in vbox for trunk/src

Timestamp:

Jul 11, 2012 7:45:32 PM (13 years ago)

Author:

vboxsync

Message:

Installer/linux: autostart service integration

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (4 diffs)
• VBox.sh (modified) (1 diff)
• install.sh (modified) (6 diffs)
• uninstall.sh (modified) (3 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -53 +53 @@
                 deffiles \
                 routines.sh \
+                vboxautostart-service.sh \
                 vboxballoonctrl-service.sh \
                 vboxdrv.sh \
@@ -323 +324 @@
                 $(VBOX_PATH_LNX_INST_SRC)/deffiles \
                 $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
+                $(VBOX_LNX_INST_OUT_DIR)/vboxautostart-service.sh \
                 $(VBOX_LNX_INST_OUT_DIR)/vboxballoonctrl-service.sh \
                 $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh \
@@ -335 +337 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/deffiles             $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT)    $(VBOX_LNX_INST_STAGE_DIR)/LICENSE)
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/vboxautostart-service.sh $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/vboxballoonctrl-service.sh $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh            $(VBOX_LNX_INST_STAGE_DIR)/
@@ -346 +349 @@
 
 # files that needs editing before they can be included in the generic installer.
+$(VBOX_LNX_INST_OUT_DIR)/vboxautostart-service.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxautostart-service.sh.in | $$(dir $$@)
+        $(QUIET)$(SED_EXT) \
+                -e "s|%NOLSB%|yes|g" \
+                -e "s|%DEBIAN%||g" \
+                -e "s|%PACKAGE%|virtualbox|g" \
+                -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
+                --output $@ \
+                $<
+
 $(VBOX_LNX_INST_OUT_DIR)/vboxballoonctrl-service.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxballoonctrl-service.sh.in | $$(dir $$@)
         $(QUIET)$(SED_EXT) \

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

@@ -92 +92 @@
         exec "$INSTALL_DIR/VBoxHeadless" "$@"
         ;;
+    VBoxAutostart|vboxautostart)
+        exec "$INSTALL_DIR/VBoxAutostart" "$@"
+        ;;
     VBoxBalloonCtrl|vboxballoonctrl)
         exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"

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

@@ -110 +110 @@
     check_binary "/usr/bin/VBoxHeadless" "$install_dir" &&
     check_binary "/usr/bin/VBoxBalloonCtrl" "$install_dir" &&
+    check_binary "/usr/bin/VBoxAutostart" "$install_dir" &&
     check_binary "/usr/bin/vboxwebsrv" "$install_dir"
 }
@@ -125 +126 @@
 # Set up logging before anything else
 create_log $LOG
+
+# Now stop the autostart service otherwise it will keep VBoxSVC running
+stop_init_script vboxautostart-service
 
 # Now stop the ballon control service otherwise it will keep VBoxSVC running
@@ -373 +377 @@
     install_init_script vboxdrv.sh vboxdrv
     install_init_script vboxballoonctrl-service.sh vboxballoonctrl-service
+    install_init_script vboxautostart-service.sh vboxautostart-service
     install_init_script vboxweb-service.sh vboxweb-service
     delrunlevel vboxdrv > /dev/null 2>&1
@@ -378 +383 @@
     delrunlevel vboxballoonctrl-service > /dev/null 2>&1
     addrunlevel vboxballoonctrl-service 25 75 # This may produce useful output
+    delrunlevel vboxautostart-service > /dev/null 2>&1
+    addrunlevel vboxautostart-service 25 75 # This may produce useful output
     delrunlevel vboxweb-service > /dev/null 2>&1
     addrunlevel vboxweb-service 25 75 # This may produce useful output
@@ -391 +398 @@
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxHeadless
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxBalloonCtrl
+    ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/VBoxAutostart
     ln -sf $INSTALLATION_DIR/VBox.sh /usr/bin/vboxwebsrv
     ln -sf $INSTALLATION_DIR/VBox.png /usr/share/pixmaps/VBox.png
@@ -467 +475 @@
         fi
         start_init_script vboxballoonctrl-service
+        start_init_script vboxautostart-service
         start_init_script vboxweb-service
         log ""

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

@@ -50 +50 @@
 # Stop the ballon control service
 stop_init_script vboxballoonctrl-service
+# Stop the autostart service
+stop_init_script vboxautostart-service
 # Stop the web service
 stop_init_script vboxweb-service
@@ -58 +60 @@
 delrunlevel vboxballoonctrl-service > /dev/null 2>&1
 remove_init_script vboxballoonctrl-service
+delrunlevel vboxautostart-service > /dev/null 2>&1
+remove_init_script vboxautostart-service
 delrunlevel vboxweb-service > /dev/null 2>&1
 remove_init_script vboxweb-service
@@ -93 +97 @@
   /usr/bin/VBoxHeadless \
   /usr/bin/VBoxBalloonCtrl \
+  /usr/bin/VBoxAutostart \
   /usr/bin/VBoxNetDHCP \
   /usr/bin/vboxwebsrv \