Provision: desktop-basic: do not set /etc/modprobe.d/qxl-no-kms.conf by default

diff --git a/share/provision/desktop-basic b/share/provision/desktop-basic
index 21ee3a1b14cf59786bc63bc83dcc31736f388cd2..7f435f0b0066528f36746f73fa3f0ef0a68d5aa7 100755 (executable)
--- a/share/provision/desktop-basic
+++ b/share/provision/desktop-basic
@@ -32,10 +32,10 @@ $DIRNAME/development $HOSTNAME $DOMAIN $MIRROR
 # QLX
 # See https://labs.riseup.net/code/issues/11518
 #     https://bugs.mageia.org/show_bug.cgi?id=14607
-if [ ! -e "/etc/modprobe.d/qxl-no-kms.conf" ]; then
-  echo 'options qxl modeset=0' | sudo tee /etc/modprobe.d/qxl-no-kms.conf
-  sudo update-initramfs -v -u
-fi
+#if [ ! -e "/etc/modprobe.d/qxl-no-kms.conf" ]; then
+#  echo 'options qxl modeset=0' | sudo tee /etc/modprobe.d/qxl-no-kms.conf
+#  sudo update-initramfs -v -u
+#fi
 
 # 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 3d75e76246aedf81c48a43833ebf536956baa2ff..c465f7461d7b3cef0c69235833b4fca1386d4dbf 100644 (file)
--- a/share/provision/files/desktop-basic/home/user/.custom/xsession
+++ b/share/provision/files/desktop-basic/home/user/.custom/xsession
@@ -3,7 +3,7 @@
 #
 WINDOW_MANAGER="ratpoison"
 PROGRAMS="$PROGRAMS terminal"
-DISPLAY_DEVICE="qxl-0" # or maybe Virtual-0
+DISPLAY_DEVICE="Virtual-0" # or maybe qlx-0
 
 #
 # Set screen size