summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2020-01-13 13:29:51 +0100
committerJonathan Bauer2020-01-13 13:29:51 +0100
commitf930a4209fa574da9695ed15d52c5078bc3b03ed (patch)
treedfbaefdcf5ac48443947ef4ac1488a291a222250
parent[kiosk-chromium] support url-encoded bookmarks (diff)
downloadmltk-f930a4209fa574da9695ed15d52c5078bc3b03ed.tar.gz
mltk-f930a4209fa574da9695ed15d52c5078bc3b03ed.tar.xz
mltk-f930a4209fa574da9695ed15d52c5078bc3b03ed.zip
[lightdm*] make sure nothing wraps the greeter
with the new stage4, the default lightdm configs wrapped the greeter call with some dbus-daemon spawning script which somehow led to lightdm not killing Xorg when all user processes were gone. The problem file is /usr/share/lightdm/lightdm.conf.d/50-greeter-wrapper.conf I thought it'd be better to specify our trivial wrapper instead of simply removing that config file... NOTE: do we break anything else from the Stage4 if we do not wrap the greeter like the lightdm packages try to?
-rw-r--r--core/modules/lightdm-greeter-bwlp/data/etc/lightdm/lightdm.conf.d/10-openslx.conf2
-rwxr-xr-xcore/modules/lightdm-greeter-bwlp/data/opt/openslx/lightdm/greeter-wrapper5
2 files changed, 6 insertions, 1 deletions
diff --git a/core/modules/lightdm-greeter-bwlp/data/etc/lightdm/lightdm.conf.d/10-openslx.conf b/core/modules/lightdm-greeter-bwlp/data/etc/lightdm/lightdm.conf.d/10-openslx.conf
index 8fbb9e25..b58e55c0 100644
--- a/core/modules/lightdm-greeter-bwlp/data/etc/lightdm/lightdm.conf.d/10-openslx.conf
+++ b/core/modules/lightdm-greeter-bwlp/data/etc/lightdm/lightdm.conf.d/10-openslx.conf
@@ -1,7 +1,7 @@
[SeatDefaults]
greeter-hide-users=true
greeter-session=qt-lightdm-greeter
-
+greeter-wrapper=/opt/openslx/lightdm/greeter-wrapper
greeter-allow-guest=true
allow-guest=true
guest-wrapper=/opt/openslx/lightdm/guest-session
diff --git a/core/modules/lightdm-greeter-bwlp/data/opt/openslx/lightdm/greeter-wrapper b/core/modules/lightdm-greeter-bwlp/data/opt/openslx/lightdm/greeter-wrapper
new file mode 100755
index 00000000..a77120c0
--- /dev/null
+++ b/core/modules/lightdm-greeter-bwlp/data/opt/openslx/lightdm/greeter-wrapper
@@ -0,0 +1,5 @@
+#!/bin/ash
+#
+# This just makes sure that nothing else wraps the greeter startup...
+
+exec "$@"