From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 6 Feb 2019 18:34:13 +0000 (+0100)
Subject: udev: check whether systemd is running, and do not use cg_kill() if not
X-Git-Tag: v241~5
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=31cbd2025359e1e8435a2dc371e439591846d8c4

udev: check whether systemd is running, and do not use cg_kill() if not

Fixes #11645.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index c637b98c7c7..0303f36b4f2 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1798,10 +1798,10 @@ static int run(int argc, char *argv[]) {
 
         dev_setup(NULL, UID_INVALID, GID_INVALID);
 
-        if (getppid() == 1) {
-                /* get our own cgroup, we regularly kill everything udev has left behind
-                   we only do this on systemd systems, and only if we are directly spawned
-                   by PID1. otherwise we are not guaranteed to have a dedicated cgroup */
+        if (getppid() == 1 && sd_booted() > 0) {
+                /* Get our own cgroup, we regularly kill everything udev has left behind.
+                 * We only do this on systemd systems, and only if we are directly spawned
+                 * by PID1. Otherwise we are not guaranteed to have a dedicated cgroup. */
                 r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &cgroup);
                 if (r < 0) {
                         if (IN_SET(r, -ENOENT, -ENOMEDIUM))