Changeset 108067 in vbox

Timestamp:

Feb 5, 2025 11:35:39 AM (2 weeks ago)

Author:

vboxsync

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

167347

Message:

Additions: Installer: Linux: Fix installation script for systems which do not have X.org installed, bugref:10859.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh (modified) (2 diffs)

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

@@ -261 +261 @@
         ps -Af | grep -q '[X]org' || ${MODPROBE} -q vboxvideo
     fi
+
+    # Our logging code generates some glue code on 32-bit systems.  At least F10
+    # needs a rule to allow this.  Send all output to /dev/null in case this is
+    # completely irrelevant on the target system.
+    # chcon is needed on old Fedora/Redhat systems.  No one remembers which.
+    chcon -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
+    semanage fcontext -a -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
+
+    # And set up VBoxClient to start when the X session does
+    install_x11_startup_app "${lib_dir}/98vboxadd-xclient" "${lib_dir}/vboxclient.desktop" VBoxClient VBoxClient-all ||
+        fail "Failed to set up VBoxClient to start automatically."
+    ln -s "${lib_dir}/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
 
     test -z "$x_version" -o -z "$modules_dir" &&
@@ -480 +492 @@
     esac
 
-    # Our logging code generates some glue code on 32-bit systems.  At least F10
-    # needs a rule to allow this.  Send all output to /dev/null in case this is
-    # completely irrelevant on the target system.
-    # chcon is needed on old Fedora/Redhat systems.  No one remembers which.
-    chcon -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
-    semanage fcontext -a -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
-
-    # And set up VBoxClient to start when the X session does
-    install_x11_startup_app "${lib_dir}/98vboxadd-xclient" "${lib_dir}/vboxclient.desktop" VBoxClient VBoxClient-all ||
-        fail "Failed to set up VBoxClient to start automatically."
-    ln -s "${lib_dir}/98vboxadd-xclient" /usr/bin/VBoxClient-all 2>/dev/null
     case "${x_version}" in 4.* | 6.* | 7.* | 1.?.* | 1.1* )
         setup_opengl
     esac
-    # Try enabling VMSVGA drm device resizing.
-    #VBoxClient --vmsvga
 }