summarylogtreecommitdiffstats
path: root/018-upate-xclient-script.patch
blob: a3bc39ddd91f87b319d4875d0932be534e188bbb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From 12e0a15f8893187ee92fa5af8095b8bb33adefe5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 17 Oct 2022 16:40:29 +0200
Subject: [PATCH] upate xclient script

---
 src/VBox/Additions/x11/Installer/98vboxadd-xclient | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
index 7c9b5989..271261a4 100755
--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
@@ -31,16 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do
     test -w $i || rm -f $i
 done

-if ! test -c /dev/vboxguest 2>/dev/null; then
-   # Do not start if the kernel module is not present.
-   # Execute notify-send in the back-ground to avoid racing with sddm,
-   # as notify-send may wait for sddm to start while it waits for us to exit.
-   notify-send "VBoxClient: the VirtualBox kernel service is not running.  Exiting." &
-elif test -z "${SSH_CONNECTION}"; then
-   # This script can also be triggered by a connection over SSH, which is not
-   # what we had in mind, so we do not start VBoxClient in that case.  We do
-   # not use "exit" here as this script is "source"d, not executed.
-
+# Do not start if the kernel module is not present; or if this script is
+# triggered by a connection over SSH.
+if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then
     # Check wheather X11 or Wayland version of VBoxClient should be started.
     vbox_wl_check=$(/usr/bin/vboxwl --check 2> /dev/null)
     if test "$vbox_wl_check" = "WL"; then
@@ -52,5 +45,4 @@ elif test -z "${SSH_CONNECTION}"; then
     fi

     /usr/bin/VBoxClient --checkhostversion
-    /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled
 fi