Changeset 24537 in vbox

Timestamp:

Nov 10, 2009 11:48:35 AM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: more fixes

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• drm/Makefile.kmk (modified) (2 diffs)
• installer/vboxadd-service.sh (modified) (2 diffs)
• installer/vboxadd.sh (modified) (1 diff)

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

@@ -143 +143 @@
 VBOX_ADD_KMOD.linux = \
         vboxvfs \
-        vboxvideo_drm
+        vboxvideo
 
 VBOX_ADD_INIT.linux = \
@@ -438 +438 @@
         $(QUIET)$(VBOX_MAKESELF) --nocomp $(VBOX_LNX_ADD_INST_STAGE_DIR) $@ \
                 "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux" \
-                /bin/sh ./install.sh "> /dev/null"
-
+                /bin/sh ./install.sh "\$$0 1> /dev/null"
+

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

@@ -35 +35 @@
 include $(PATH_SUB_CURRENT)/files_vboxvideo_drm
 
-vboxvideo_drm-mod_INST        = $(INST_ADDITIONS)src/vboxvideo_drm/
+vboxvideo_drm-mod_INST        = $(INST_ADDITIONS)src/vboxvideo/
 vboxvideo_drm-mod_MODE        = a+r,u+w
 vboxvideo_drm-mod_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_NOBIN))
@@ -42 +42 @@
 vboxvideo_drm-mod_CLEAN      += $(PATH_vboxvideo_drm-mod)/dkms.conf
 
-vboxvideo_drm-sh_INST        = $(INST_ADDITIONS)src/vboxvideo_drm/
+vboxvideo_drm-sh_INST        = $(INST_ADDITIONS)src/vboxvideo/
 vboxvideo_drm-sh_MODE        = a+rx,u+w
 vboxvideo_drm-sh_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_BIN))

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

@@ -239 +239 @@
 binary=/usr/sbin/VBoxService
 
-test -x "$binary" || {
-    echo "Cannot run $binary"
-    exit 1
+testbinary() {
+    test -x "$binary" || {
+        echo "Cannot run $binary"
+        exit 1
+    }
 }
 
@@ -255 +257 @@
             exit 1
         }
+        testbinary
         daemon $binary
         RETVAL=$?

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

@@ -395 +395 @@
             version=`echo "$line" | sed "s/$mod,\([^,]*\)[,:].*/\1/;t;d"`
             echo "  removing module $mod version $version"
-            $DKMS remove -m $mod -v $version --all >/dev/null
+            $DKMS remove -m $mod -v $version --all 1>&2
           fi
         done