#2834 switch to Xvfb on Debian and Ubuntu

git-svn-id: https://xpra.org/svn/Xpra/trunk@27165 3bb7dfac-3a0b-4e04-842a-767bc560f471

debian/control

@@ -73,9 +73,8 @@ Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
         ,python3-lz4
 # clipboard packet compression:
         ,python3-brotli
-#we need a vfb: either Xdummy (Debian) or Xvfb (some Ubuntu versions break Xorg tty access)
-#install both so users can choose which one they want to use:
-        ,xserver-xorg-video-dummy | xserver-xorg-video-dummy-hwe
+#we need a vfb: either Xdummy or Xvfb
+#        ,xserver-xorg-video-dummy | xserver-xorg-video-dummy-hwe
         ,xvfb
         ,keyboard-configuration
 # fast JPEG client support:

debian/rules

@@ -8,7 +8,7 @@
 #stretch:export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 #buster:export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-BUILDOPTS= --with-Xdummy --without-Xdummy_wrapper --pkg-config-path=/usr/lib/xpra/pkgconfig --rpath=/usr/lib/xpra/
+BUILDOPTS= --without-Xdummy --without-Xdummy_wrapper --pkg-config-path=/usr/lib/xpra/pkgconfig --rpath=/usr/lib/xpra/
 
 %:
 	dh $@ --with python3 --with systemd

src/xpra/scripts/config.py

@@ -11,7 +11,7 @@
 from xpra.os_util import (
     WIN32, OSX, POSIX,
     osexpand, getuid, getgid, get_username_for_uid,
-    is_Debian, is_arm,
+    is_Debian, is_Ubuntu, is_arm,
     )
 
 def warn(msg):
@@ -134,6 +134,10 @@ def detect_xvfb_command(conf_dir="/etc/xpra/", bin_dir=None,
     if is_arm():
         #arm struggles to launch Xdummy, so use Xvfb:
         return get_Xvfb_command()
+    if is_Ubuntu() or is_Debian():
+        #These distros do weird things and this can cause the real X11 server to crash
+        #see ticket #2834
+        return get_Xvfb_command()
 
     xorg_bin = get_xorg_bin()
     def Xorg_suid_check():