From: Michal Sekletar Date: Thu, 25 Aug 2016 22:07:58 +0000 (+0200) Subject: units: remove udev control socket when systemd stops the socket unit (#4039) X-Git-Tag: v232~258 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51bce29f8eee1cdc0eb25c8fe87e69e24b5fbd98;p=thirdparty%2Fsystemd.git units: remove udev control socket when systemd stops the socket unit (#4039) Mere presence of the socket in the filesystem makes udev_queue_get_udev_is_active() return that udev is running. Note that, udev on exit doesn't unlink control socket nor does systemd. Thus socket stays around even when both daemon and socket are stopped. This causes problems for cryptsetup because when it detects running udev it launches synchronous operations that *really* require udev. This in turn may cause blocking and subsequent timeout in systemd-cryptsetup on reboot while machine is in a state that udev and its control socket units are stopped, e.g. emergency mode. Fixes #2477 --- diff --git a/units/systemd-udevd-control.socket b/units/systemd-udevd-control.socket index 8330a1c035e..46f704ed790 100644 --- a/units/systemd-udevd-control.socket +++ b/units/systemd-udevd-control.socket @@ -17,3 +17,4 @@ Service=systemd-udevd.service ListenSequentialPacket=/run/udev/control SocketMode=0600 PassCredentials=yes +RemoveOnStop=yes