Provision: fixes QLX KMS issues on desktop-basic

diff --git a/share/provision/desktop-basic b/share/provision/desktop-basic
index 38d69e390b8afe1db0aac53a0472faa10c496f6e..d87aff013a2138f3cf6b5fa664f68a0acda99b6a 100755 (executable)
--- a/share/provision/desktop-basic
+++ b/share/provision/desktop-basic
@@ -29,6 +29,12 @@ APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 # Provision the basic stuff
 $DIRNAME/development $HOSTNAME $DOMAIN $MIRROR
 
+# QLX
+# See https://labs.riseup.net/code/issues/11518
+#     https://bugs.mageia.org/show_bug.cgi?id=14607
+echo 'options qxl modeset=0' | sudo tee /etc/modprobe.d/qxl-no-kms.conf
+sudo update-initramfs -v -u
+
 # Ensure we are in the user home folder
 cd
 

diff --git a/share/provision/files/desktop-basic/home/user/.custom/xsession b/share/provision/files/desktop-basic/home/user/.custom/xsession
index 97ef73d5669f9d6ae56132f0c4896f2ee48c076c..3d75e76246aedf81c48a43833ebf536956baa2ff 100644 (file)
--- a/share/provision/files/desktop-basic/home/user/.custom/xsession
+++ b/share/provision/files/desktop-basic/home/user/.custom/xsession
@@ -2,21 +2,21 @@
 # Custom X11 session config
 #
 WINDOW_MANAGER="ratpoison"
-PROGRAMS="\$PROGRAMS terminal"
+PROGRAMS="$PROGRAMS terminal"
+DISPLAY_DEVICE="qxl-0" # or maybe Virtual-0
 
 #
 # Set screen size
 #
 
-# On stretch onwards Virtual-0 was renamed to Virtual-0
 # Modeline determined by running "cvt 1280 780"
 xrandr --newmode "1280x780_60.00"   81.50  1280 1352 1480 1680  780 783 793 810 -hsync +vsync
-xrandr --addmode Virtual-0 1280x780_60.00
+xrandr --addmode $DISPLAY_DEVICE 1280x780_60.00
 
 # Modeline determined by running "cvt 1368 748"
 xrandr --newmode "1368x748_60.00"   83.00  1368 1440 1576 1784  748 751 761 777 -hsync +vsync
-xrandr --addmode Virtual-0 1368x748_60.00
+xrandr --addmode $DISPLAY_DEVICE 1368x748_60.00
 
 # Set default modeline
-#xrandr --output Virtual-0 --mode 1368x748_60.00
-xrandr --output Virtual-0 --mode 1280x780_60.00
+#xrandr --output $DISPLAY_DEVICE --mode 1368x748_60.00
+xrandr --output $DISPLAY_DEVICE --mode 1280x780_60.00