Changeset 11725 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Aug 27, 2008 10:21:47 PM (16 years ago)

Author:

vboxsync

Message:

#3076: Merged in the branch with the alternate driver authentication method. (34468:HEAD)

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (6 diffs)
• VBox.sh (modified) (2 diffs)

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

@@ -70 +70 @@
         VBoxREM.so \
         VBoxRT.so \
-        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
+        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL $(if $(VBOX_WITH_HARDENING),VBoxSDL.so),) \
         VBoxSettings.so \
         VBoxSVC \
@@ -113 +113 @@
   LINUXSTRIPBIN += \
         VBoxKeyboard.so \
-        VirtualBox
+        VirtualBox \
+        $(if $(VBOX_WITH_HARDENING),VirtualBox.so)
   LINUXNOSTRIP += \
         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/libVBox*)),) \
@@ -173 +174 @@
 ifdef VBOX_WITH_HEADLESS
  LINUXSTRIPBIN += \
-        VBoxHeadless
+        VBoxHeadless \
+        $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so)
 endif
 ifdef VBOX_WITH_WEBSERVICES
@@ -200 +202 @@
         $(call MSG_TOOL,makeself,,$@)
         $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*.run)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
-                -e "s;_BUILD_;$(shell date);g" \
-                -e "s;_ARCH_;${KBUILD_TARGET_ARCH};g" \
+        $(QUIET)$(SED) \
+                -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
+                -e "s;_BUILD_;$(date-utc );g" \
+                -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
+                -e "s;_HARDENED_;$(VBOX_WITH_HARDENING);g" \
                 < install.sh > $(PATH_TARGET)/install/install.sh
         $(QUIET)chmod 0744 $(PATH_TARGET)/install/install.sh
@@ -268 +272 @@
 $(PATH_BIN)/VBoxAddIF.sh: VBoxAddIF.sh $(VBOX_VERSION_STAMP)
         $(call MSG_GENERATE,,$@,$<)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" $< > $@
+        $(QUIET)$(SED) -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" $< > $@
         $(QUIET)chmod 0755 $@
 
@@ -281 +285 @@
 # Note: The -m <mode> feature of kmk_builtin_install does not work together with fakeroot!
 # Note: $(INSTALL) -s is currently not reliable when used in parallel builds. Fixed in 0.1.1.
+# Update: Both these issues has been resolved.
 $(foreach f,$(LINUXSTRIPBIN),$(PATH_TARGET)/archive/$(f)): \
                 $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \

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

@@ -53 +53 @@
          You will not be able to start VMs until this problem is fixed.
 EOF
-elif [ ! -w /dev/vboxdrv ]; then
-    if [ "`id | grep vboxusers`" = "" ]; then
-        cat << EOF
-WARNING: You are not a member of the "vboxusers" group.  Please add yourself
-         to this group before starting VirtualBox.
-
-         You will not be able to start VMs until this problem is fixed.
-EOF
-    else
-        cat << EOF
-WARNING: /dev/vboxdrv not writable for some reason. If you recently added the
-         current user to the vboxusers group then you have to logout and
-         re-login to take the change effect.
-
-         You will not be able to start VMs until this problem is fixed.
-EOF
-    fi
 fi
 
@@ -79 +62 @@
 EOF
 fi
-
-export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
 SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`