From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 17 Mar 2023 12:07:56 +0000 (+0100)
Subject: units: Order user@.service after systemd-oomd.service
X-Git-Tag: v254-rc1~988
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cafd2c0be404cb8879f91d15e05cc8b695b32629;p=thirdparty%2Fsystemd.git

units: Order user@.service after systemd-oomd.service

The user manager connects to oomd over varlink. Currently, during
shutdown, if oomd is stopped before any user manager, the user
manager will try to reconnect to the socket, leading to a warning
from pid 1 about a conflicting transaction.

Let's fix this by ordering user@.service after systemd-oomd.service,
so that user sessions are stopped before systemd-oomd is stopped,
which makes sure that the user sessions won't try to start oomd via
its socket after systemd-oomd is stopped.
---

diff --git a/units/user@.service.in b/units/user@.service.in
index 0c3440bb3f1..41ed55cb1ae 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -10,7 +10,7 @@
 [Unit]
 Description=User Manager for UID %i
 Documentation=man:user@.service(5)
-After=user-runtime-dir@%i.service dbus.service
+After=user-runtime-dir@%i.service dbus.service systemd-oomd.service
 Requires=user-runtime-dir@%i.service
 IgnoreOnIsolate=yes