From 4eb8049a3317a36c51a9e9574eb999858fe0618b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 11 Feb 2020 16:49:03 +0100 Subject: [PATCH 1/5] lightdm: Update version from 1.28.0 to 1.30.0 https://github.com/canonical/lightdm/releases/tag/1.30.0 --- lightdm.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightdm.be0 b/lightdm.be0 index a044b504b..619ddf5e1 100755 --- a/lightdm.be0 +++ b/lightdm.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION lightdm-1.28.0-2 +# BEE_VERSION lightdm-1.30.0-0 SRCURL[0]="https://github.com/CanonicalLtd/lightdm/releases/download/${PKGVERSION}/lightdm-${PKGVERSION}.tar.xz" From 4f0ce8e9f793986ea995c8d3d232e849a5f0d707 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 11 Feb 2020 16:50:09 +0100 Subject: [PATCH 2/5] lightdm: Order service correctly after `startup-tags.service` Without specifying the ordering in regards to `startup-tags.service` it is not guaranteed, that `/node/tags/` has been populated yet, and we have observed a non-starting LightDM on desktop systems in practice. So, order the service unit correctly. --- lightdm.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lightdm.be0 b/lightdm.be0 index 619ddf5e1..d34b81f85 100755 --- a/lightdm.be0 +++ b/lightdm.be0 @@ -81,8 +81,8 @@ EOF cat <<-UNIT > ${D}/etc/systemd/system/lightdm.service [Unit] Description=LightDM - Wants=nvidia.service - After=nvidia.service + Wants=nvidia.service startup-tags.service + After=nvidia.service startup-tags.service ConditionPathExists=/node/tags/lightdm [Service] From 96bece1b12473a2a7c5bf5de7902f22f1b19d915 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 11 Feb 2020 16:55:12 +0100 Subject: [PATCH 3/5] lightdm: Remove `StandardOutput=` configuration from service unit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From manual page systemd.exec(5): > StandardOutput= > Controls where file descriptor 1 (STDOUT) of the executed processes is > connected to. Takes one of inherit, null, tty, journal, syslog, kmsg, > journal+console, syslog+console, kmsg+console, file:path, append:path, socket > or fd:name. > > […] > > syslog connects standard output to the syslog(3) system syslog service, in > addition to the journal. Note that the journal daemon is usually configured to > forward everything it receives to syslog anyway, in which case this option is > no different from journal. So remove the configuration. --- lightdm.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/lightdm.be0 b/lightdm.be0 index d34b81f85..4b924d643 100755 --- a/lightdm.be0 +++ b/lightdm.be0 @@ -87,7 +87,6 @@ EOF [Service] ExecStart=/usr/bin/lightdm - StandardOutput=syslog Restart=always UMask=007 From 2c4e1b01f6d1e00f016062e51c23fdd02656c62e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 11 Feb 2020 17:08:54 +0100 Subject: [PATCH 4/5] lightdm: Order service unit after `systemd-user-sessions.service` Do it [as Debian does it] (https://github.com/canonical/lightdm/blob/ff1c38c0616b3df66a5002ed7f531d53f218dfab/debian/lightdm.service). --- lightdm.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightdm.be0 b/lightdm.be0 index 4b924d643..9f5adbc52 100755 --- a/lightdm.be0 +++ b/lightdm.be0 @@ -82,7 +82,7 @@ EOF [Unit] Description=LightDM Wants=nvidia.service startup-tags.service - After=nvidia.service startup-tags.service + After=systemd-user-sessions.service nvidia.service startup-tags.service ConditionPathExists=/node/tags/lightdm [Service] From 24bbe14e755edb2a80da1c65715d20bd0d041b3e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 11 Feb 2020 17:10:20 +0100 Subject: [PATCH 5/5] lightdm: Specify D-Bus bus name in service unit Do it [as Debian does it] (https://github.com/canonical/lightdm/blob/ff1c38c0616b3df66a5002ed7f531d53f218dfab/debian/lightdm.service). From manual page systemd.service(5): > BusName= > Takes a D-Bus bus name that this service is reachable as. This option is > mandatory for services where Type= is set to dbus. --- lightdm.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/lightdm.be0 b/lightdm.be0 index 9f5adbc52..83b01990e 100755 --- a/lightdm.be0 +++ b/lightdm.be0 @@ -88,6 +88,7 @@ EOF [Service] ExecStart=/usr/bin/lightdm Restart=always + BusName=org.freedesktop.DisplayManager UMask=007 [Install]