summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-03-26 08:54:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-29 12:05:31 +0100
commitce987c6ae867eb9b0850445d496fb01c5c6709af (patch)
treec4bd35df5d311d06161229ddf941e9c03fd26d5d /meta/recipes-core
parent4bf1c0401accbd0507794093f0d02640306029f0 (diff)
downloadpoky-ce987c6ae867eb9b0850445d496fb01c5c6709af.tar.gz
psplash: Set RemainAfterExit on systemd units
psplash is only expected to run during startup, but if any dependency is pulled into a transaction and the unit is inactive, then it can be restarted. Set RemainAfterExit to ensure that the unit remains active and is not gratuitously restarted. Drop the nonexistent systemd-start.service from the unit. (From OE-Core rev: 618bd9a10c27d13a4420638d82618ac41935cfda) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/psplash/files/psplash-start.service1
-rw-r--r--meta/recipes-core/psplash/files/psplash-systemd.service2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service
index a8c97c7a75..36c2bb38e0 100644
--- a/meta/recipes-core/psplash/files/psplash-start.service
+++ b/meta/recipes-core/psplash/files/psplash-start.service
@@ -6,6 +6,7 @@ RequiresMountsFor=/run
6[Service] 6[Service]
7Type=notify 7Type=notify
8ExecStart=/usr/bin/psplash 8ExecStart=/usr/bin/psplash
9RemainAfterExit=yes
9 10
10[Install] 11[Install]
11WantedBy=sysinit.target 12WantedBy=sysinit.target
diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service
index 4e18980bb2..082207f232 100644
--- a/meta/recipes-core/psplash/files/psplash-systemd.service
+++ b/meta/recipes-core/psplash/files/psplash-systemd.service
@@ -1,13 +1,13 @@
1[Unit] 1[Unit]
2Description=Start psplash-systemd progress communication helper 2Description=Start psplash-systemd progress communication helper
3DefaultDependencies=no 3DefaultDependencies=no
4After=systemd-start.service
5After=psplash-start.service 4After=psplash-start.service
6Requires=psplash-start.service 5Requires=psplash-start.service
7RequiresMountsFor=/run 6RequiresMountsFor=/run
8 7
9[Service] 8[Service]
10ExecStart=/usr/bin/psplash-systemd 9ExecStart=/usr/bin/psplash-systemd
10RemainAfterExit=yes
11 11
12[Install] 12[Install]
13WantedBy=sysinit.target 13WantedBy=sysinit.target