naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
6f381c
From 818ddd1efd751ef50f9960920284465befe9d704 Mon Sep 17 00:00:00 2001
6f381c
From: Lennart Poettering <lennart@poettering.net>
6f381c
Date: Wed, 8 Apr 2020 16:25:03 +0200
6f381c
Subject: [PATCH] units: make sure systemd-pstore stops at shutdown
6f381c
6f381c
This doesn't matter too much given that the service doesn't do anything
6f381c
on shutdown, but let's still stop it to make things cleaner.
6f381c
6f381c
(cherry picked from commit b0c1a07654c80d3cbbbcc52f860d4206707c0b08)
6f381c
6f381c
Related: #2158832
6f381c
---
6f381c
 units/systemd-pstore.service.in | 3 ++-
6f381c
 1 file changed, 2 insertions(+), 1 deletion(-)
6f381c
6f381c
diff --git a/units/systemd-pstore.service.in b/units/systemd-pstore.service.in
6f381c
index 9a86f3145c..8cbf264a99 100644
6f381c
--- a/units/systemd-pstore.service.in
6f381c
+++ b/units/systemd-pstore.service.in
6f381c
@@ -14,7 +14,8 @@ ConditionDirectoryNotEmpty=/sys/fs/pstore
6f381c
 ConditionVirtualization=!container
6f381c
 DefaultDependencies=no
6f381c
 After=systemd-remount-fs.service
6f381c
-Before=sysinit.target
6f381c
+Conflicts=shutdown.target
6f381c
+Before=sysinit.target shutdown.target
6f381c
 
6f381c
 [Service]
6f381c
 Type=oneshot