diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-01-06 15:22:04 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-01-06 15:27:21 +0000 |
| commit | 160340248c7aa8462129b24792d9baae11346511 (patch) | |
| tree | b84052c061b73ff7106b61fb06a4e550d9e3886a | |
| parent | bd5f5a5290e66ce1b90b1ff87b1ae134ee7e4a9b (diff) | |
| download | draklive-config-160340248c7aa8462129b24792d9baae11346511.tar draklive-config-160340248c7aa8462129b24792d9baae11346511.tar.gz draklive-config-160340248c7aa8462129b24792d9baae11346511.tar.bz2 draklive-config-160340248c7aa8462129b24792d9baae11346511.tar.xz draklive-config-160340248c7aa8462129b24792d9baae11346511.zip | |
live.cfg: for GNOME, disable Wayland when we know it won't work.
This works around the gdm autologin bug (mga#20079).
| -rw-r--r-- | config/live.cfg | 2 | ||||
| -rwxr-xr-x | files/50gdm-nokms-disable-wayland.xsetup | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg index df36c77..33e3478 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -39,6 +39,8 @@ my $_l = { [ 'files/glib2-branding.gschema.override', '/usr/share/glib-2.0/schemas/glib2-branding.gschema.override', { mode => 0644 } ], # enable root access to display to allow MCC and draklive-install to be run from the desktop [ 'files/gnome-enable-root-gui.desktop', '/etc/xdg/autostart/gnome-enable-root-gui.desktop', { mode => 0644 } ], + # disable Wayland when we know it won't work (workaround for mga#20079) + [ 'files/50gdm-nokms-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-nokms-disable-wayland.xsetup', { mode => 0755 } ], ), # blacklist pata_acpi [ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ], diff --git a/files/50gdm-nokms-disable-wayland.xsetup b/files/50gdm-nokms-disable-wayland.xsetup new file mode 100755 index 0000000..6232353 --- /dev/null +++ b/files/50gdm-nokms-disable-wayland.xsetup @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -e /run/mgalive -a -f /etc/X11/gdm/custom.conf ]; then + if /bin/grep -q nokmsboot /proc/cmdline; then + sed -i 's/#WaylandEnable=false/WaylandEnable=false/' /etc/X11/gdm/custom.conf + fi +fi |