Changeset 72322 in vbox for trunk

Timestamp:

May 24, 2018 1:24:30 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122776

Message:

Installer/Linux: bugref:9049: Simplifying code committed in r122755 to get rid of sed hack.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• install.sh (modified) (2 diffs)

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

@@ -408 +408 @@
                 -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
                 -e "s;_HARDENED_;$(VBOX_WITH_HARDENING);g" \
-                -e "s;_GUI_WITH_SHARED_LIBRARY_;$(VBOX_GUI_WITH_SHARED_LIBRARY);g" \
                 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
                 -e "s;_USERNAME_;$(USERNAME);g" \

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

@@ -34 +34 @@
 ARCH="_ARCH_"
 HARDENED="_HARDENED_"
-GUI_WITH_SHARED_LIBRARY="_GUI_WITH_SHARED_LIBRARY_"
 # The "BUILD_" prefixes prevent the variables from being overwritten when we
 # read the configuration from the previous installation.
@@ -279 +278 @@
     #                 and finally make sure the directory is only writable by the user (paranoid).
     if [ -n "$HARDENED" ]; then
-        if [ -n "$GUI_WITH_SHARED_LIBRARY" ]; then
+        if [ -f $INSTALLATION_DIR/VirtualBoxVM ]; then
             test -e $INSTALLATION_DIR/VirtualBoxVM   && chmod 4511 $INSTALLATION_DIR/VirtualBoxVM
         else