From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 24 Nov 2018 14:59:37 +0000 (+0100)
Subject: units: order systemd-rfkill.socket after /var/lib/systemd/rfkill (#10904)
X-Git-Tag: v240~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7af002f71d34afd1ba0c7f65bed7d45b103ad233;p=thirdparty%2Fsystemd.git

units: order systemd-rfkill.socket after /var/lib/systemd/rfkill (#10904)

Otherwise we might install the socket unit early, but the service
backing it late, and then end up in strange loops when we enter rescue
mode, because we saw an event on /dev/rfkill but really can't dispatch
it nor flush it.

Fixes: #9171
---

diff --git a/units/systemd-rfkill.socket b/units/systemd-rfkill.socket
index c8e9f71bf6d..9d408903bb3 100644
--- a/units/systemd-rfkill.socket
+++ b/units/systemd-rfkill.socket
@@ -12,7 +12,8 @@ Description=Load/Save RF Kill Switch Status /dev/rfkill Watch
 Documentation=man:systemd-rfkill.socket(8)
 DefaultDependencies=no
 BindsTo=sys-devices-virtual-misc-rfkill.device
-After=sys-devices-virtual-misc-rfkill.device
+After=sys-devices-virtual-misc-rfkill.device systemd-remount-fs.service
+RequiresMountsFor=/var/lib/systemd/rfkill
 Conflicts=shutdown.target
 Before=shutdown.target