Changeset 53383 in vbox for trunk/src

Timestamp:

Nov 24, 2014 9:16:52 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11: make VBoxClient-all a symbolic link, not a hard one, to prevent an SELinux labling warning.

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• installer/vboxadd-x11.sh (modified) (2 diffs)

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

@@ -121 +121 @@
 VBOX_ADD_STRIP_BIN.linux += \
         VBoxClient
-
-VBOX_ADD_BIN.linux += \
-        VBoxClient-all
 
 VBOX_ADD_STRIP_SBIN += \
@@ -379 +376 @@
         $(VBOX_REL_LNX_ADD_INST)module-autologon.sh=>installer/module-autologon
 endif
-
-#
-# VBoxClient-all
-#
-INSTALLS += LnxAdd-Nostrip-Bin
-LnxAdd-Nostrip-Bin_INST     = $(VBOX_LNX_ADD_INST_BIN_DIR)
-LnxAdd-Nostrip-Bin_INSTTYPE = stage
-LnxAdd-Nostrip-Bin_EXEC_SOURCES = \
-        $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient=>VBoxClient-all
 
 

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

@@ -563 +563 @@
     install_x11_startup_app "$lib_dir/98vboxadd-xclient" "$share_dir/vboxclient.desktop" VBoxClient VBoxClient-all ||
         fail "See the log file $LOG for more information."
+    ln -s "$lib_dir/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
     succ_msg
 }
@@ -643 +644 @@
     rm /etc/xdg/autostart/vboxclient.desktop 2>/dev/null
     rm /usr/share/autostart/vboxclient.desktop 2>/dev/null
+    rm /usr/bin/VBoxClient-all 2>/dev/null
 
     # Remove other files