Changeset 19517 in vbox for trunk

Timestamp:

May 8, 2009 11:49:52 AM (16 years ago)

Author:

vboxsync

Message:

VBoxService/common: Updated linux parts (installer, setup scripts, ...).

Location:

trunk/src/VBox/Additions

Files:

• common/Makefile.kmk (modified) (1 diff)
• linux/Makefile.kmk (modified) (4 diffs)
• linux/daemon (deleted)
• linux/installer/vboxadd-service.sh (moved) (moved from trunk/src/VBox/Additions/linux/installer/vboxadd-timesync.sh ) (6 diffs)

trunk/src/VBox/Additions/common/Makefile.kmk

@@ -29 +29 @@
  include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
 endif
-if1of ($(KBUILD_TARGET), win freebsd os2 solaris)
+if1of ($(KBUILD_TARGET), linux win freebsd os2 solaris)
  include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
 endif

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

@@ -27 +27 @@
 #
 include $(PATH_SUB_CURRENT)/module/Makefile.kmk
-include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk
 include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk
 include $(PATH_SUB_CURRENT)/drm/Makefile.kmk
@@ -84 +83 @@
 $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \
                 $(INSTARGET_vboxmod-bin) \
-                $(PATH_BIN)/additions/vboxadd-timesync \
+                $(PATH_BIN)/additions/VBoxService \
                 $(PATH_BIN)/additions/VBoxClient \
                 $(PATH_BIN)/additions/VBoxControl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh \
-                $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh \
+                $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-service.sh \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop \
@@ -145 +144 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test.drm  $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test_drm/Makefile
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test_drm.c     $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test_drm/
-        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxadd-timesync
+        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxService                $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxadd-service
         $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient                 $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxClient
         $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl                $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxControl
@@ -159 +158 @@
         $(QUIET)$(RM) $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(VBOX_LNX_ADD_INS_OUT_DIR)
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-service.sh  $(VBOX_LNX_ADD_INS_OUT_DIR)
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient     $(VBOX_LNX_ADD_INS_OUT_DIR)
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop    $(VBOX_LNX_ADD_INS_OUT_DIR)

trunk/src/VBox/Additions/linux/installer/vboxadd-service.sh

@@ -2 +2 @@
 #
 # Sun VirtualBox
-# Linux Additions timesync daemon init script
+# Linux Additions Guest Additions service daemon init script.
 #
 # Copyright (C) 2006-2009 Sun Microsystems, Inc.
@@ -20 +20 @@
 
 # chkconfig: 35 35 65
-# description: VirtualBox Additions timesync
+# description: VirtualBox Additions service
 #
 ### BEGIN INIT INFO
-# Provides:       vboxadd-timesync
+# Provides:       vboxadd-service
 # Required-Start: vboxadd
 # Required-Stop:  vboxadd
 # Default-Start:  2 3 4 5
 # Default-Stop:   0 1 6
-# Description:    VirtualBox Additions timesync
+# Description:    VirtualBox Additions Service
 ### END INIT INFO
 
@@ -36 +36 @@
 if [ -f /etc/redhat-release ]; then
     system=redhat
-    PIDFILE="/var/lock/subsys/vboxadd-timesync"
+    PIDFILE="/var/lock/subsys/vboxadd-service"
 elif [ -f /etc/SuSE-release ]; then
     system=suse
-    PIDFILE="/var/lock/subsys/vboxadd-timesync"
+    PIDFILE="/var/lock/subsys/vboxadd-service"
 elif [ -f /etc/debian_version ]; then
     system=debian
-    PIDFILE="/var/run/vboxadd-timesync"
+    PIDFILE="/var/run/vboxadd-service"
 elif [ -f /etc/gentoo-release ]; then
     system=gentoo
-    PIDFILE="/var/run/vboxadd-timesync"
+    PIDFILE="/var/run/vboxadd-service"
 elif [ -f /etc/arch-release ]; then
      system=arch
-     PIDFILE="/var/run/vboxadd-timesync"
+     PIDFILE="/var/run/vboxadd-service"
 elif [ -f /etc/slackware-version ]; then
     system=slackware
-    PIDFILE="/var/run/vboxadd-timesync"
+    PIDFILE="/var/run/vboxadd-service"
 elif [ -f /etc/lfs-release ]; then
     system=lfs
-    PIDFILE="/var/run/vboxadd-timesync.pid"
+    PIDFILE="/var/run/vboxadd-service.pid"
 else
     system=other
     if [ -d /var/run -a -w /var/run ]; then
-        PIDFILE="/var/run/vboxadd-timesync"
+        PIDFILE="/var/run/vboxadd-service"
     fi
 fi
@@ -237 +237 @@
 fi
 
-binary=/usr/sbin/vboxadd-timesync
+binary=/usr/sbin/vboxadd-service
 
 test -x "$binary" || {
@@ -257 +257 @@
         daemon $binary --daemonize
         RETVAL=$?
-        test $RETVAL -eq 0 && echo `pidof vboxadd-timesync` > $PIDFILE
+        test $RETVAL -eq 0 && echo `pidof vboxadd-service` > $PIDFILE
         succ_msg
     fi
@@ -283 +283 @@
 
     status() {
-        echo -n "Checking for vboxadd-timesync"
+        echo -n "Checking for vboxadd-service"
         if [ -f $PIDFILE ]; then
             echo " ...running"