From 49524a5268d67d00a976fb1606b6de26054f1bb7 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 18 Dec 2016 11:40:22 +0000 Subject: Revert to using GNOME on Wayland, enable root to access the display. The WaylandEnable=false setting only works for auto or passwordless login, so didn't reliably fix the problem of being unable to run MCC or draklive-install. Also, in early testing, GNOME on Wayland worked on a greater variety of hardware than GNOME on Xorg. So let's see if this works better. --- config/live.cfg | 6 +++--- files/gnome-enable-root-gui.desktop | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 files/gnome-enable-root-gui.desktop diff --git a/config/live.cfg b/config/live.cfg index 497acf8..4b1dd34 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -33,10 +33,12 @@ my $_l = { if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}), langs_always => [ 'en_US' ], files => [ - # fix gnome-shell not showing draklive-install icon in menu in live mode if_($live->{settings}{desktop} eq 'GNOME', + # fix gnome-shell not showing draklive-install icon in menu in live mode [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ], [ '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 } ], ), # blacklist pata_acpi [ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ], @@ -212,8 +214,6 @@ my $_l = { "systemctl disable network-up", "systemctl enable NetworkManager.service", "systemctl enable NetworkManager-wait-online.service", - # disable Wayland to allow MCC and draklive-install to run (mga#19498) - "sed -i 's/#WaylandEnable=false/WaylandEnable=false/' /etc/X11/gdm/custom.conf", ), # add local medias diff --git a/files/gnome-enable-root-gui.desktop b/files/gnome-enable-root-gui.desktop new file mode 100644 index 0000000..7fbe22c --- /dev/null +++ b/files/gnome-enable-root-gui.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=GNOME enable root GUI +Comment=Enables GUI applications run as root to use the local display +Exec=/usr/bin/xhost +si:localuser:root +Terminal=false +Type=Application +OnlyShowIn=GNOME +X-GNOME-Autostart-Phase=Initialization -- cgit v1.2.1