From 4a48f230714a9e63e9a75b481c8d37e80453f24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?=
 <hector@molinero.dev>
Date: Wed, 26 Apr 2023 00:24:29 +0200
Subject: [PATCH] Update xdummy service default configuration to avoid a black
 screen on the host

---
 config/X11/xorg.conf.d/10-headless.conf | 47 ++++++++++++++++---------
 scripts/service/xdummy/run              |  2 +-
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/config/X11/xorg.conf.d/10-headless.conf b/config/X11/xorg.conf.d/10-headless.conf
index d084551..f3172e1 100644
--- a/config/X11/xorg.conf.d/10-headless.conf
+++ b/config/X11/xorg.conf.d/10-headless.conf
@@ -1,24 +1,37 @@
+Section "Module"
+	Load "xorgxrdp"
+EndSection
+
+Section "ServerLayout"
+	Identifier "ServerLayout0"
+	Screen "Screen0"
+EndSection
+
+Section "ServerFlags"
+	Option "DefaultServerLayout" "ServerLayout0"
+	Option "DontVTSwitch" "on"
+	Option "AutoAddDevices" "off"
+	Option "AutoAddGPU" "off"
+EndSection
+
 Section "Monitor"
 	Identifier "Monitor0"
 	VendorName "Unknown"
 	ModelName "Unknown"
 EndSection
 
-#Section "Device"
-#	Identifier "Device0"
-#	Driver "nvidia"
-#	VendorName "NVIDIA Corporation"
-#	BusID "PCI:1:0:0"
-#	Option "AllowEmptyInitialConfiguration" "true"
-#	Option "ConnectToAcpid" "false"
-#EndSection
+Section "Device"
+	Identifier "Device0"
+	Driver "xrdpdev"
+	Option "DRMDevice" "/dev/dri/renderD128"
+	Option "DRI3" "1"
+EndSection
 
-#Section "Screen"
-#	Identifier "Screen0"
-#	Device "Device0"
-#	Monitor "Monitor0"
-#	DefaultDepth 24
-#	SubSection "Display"
-#		Depth 24
-#	EndSubSection
-#EndSection
+Section "Screen"
+	Identifier "Screen0"
+	Monitor "Monitor0"
+	Device "Device0"
+	SubSection "Display"
+		Modes "800x600"
+	EndSubSection
+EndSection
diff --git a/scripts/service/xdummy/run b/scripts/service/xdummy/run
index 47eb756..9ac9266 100755
--- a/scripts/service/xdummy/run
+++ b/scripts/service/xdummy/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 exec 2>&1
-exec /usr/lib/xorg/Xorg -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile /var/log/xdummy.log :0.0
+exec /usr/lib/xorg/Xorg -noreset -nolisten tcp -logfile /var/log/xdummy.log :0.0