[lilac] updated to 102693-2

1 files changed, 11 insertions, 7 deletions

diff --git a/018-upate-xclient-script.patch b/018-upate-xclient-script.patch
index eeb5e0e878a7..a3bc39ddd91f 100644
--- a/018-upate-xclient-script.patch
+++ b/018-upate-xclient-script.patch
@@ -11,10 +11,10 @@ diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Addit
 index 7c9b5989..271261a4 100755
 --- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
 +++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-@@ -31,18 +31,11 @@ for i in $HOME/.vboxclient-*.pid; do
+@@ -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,
@@ -24,12 +24,16 @@ index 7c9b5989..271261a4 100755
 -   # 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
-   /usr/bin/VBoxClient --clipboard
-   /usr/bin/VBoxClient --checkhostversion
-   /usr/bin/VBoxClient --seamless
-   /usr/bin/VBoxClient --draganddrop
--  /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled
+     # 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