summaryrefslogtreecommitdiffstats
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-24 15:59:37 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-11-24 15:59:37 +0100
commit7af002f71d34afd1ba0c7f65bed7d45b103ad233 (patch)
tree4724d9e70294add76735767c4eba6ab612408c09 /units
parenttests: skip test-execute on TravisCI under ASan (diff)
downloadsystemd-7af002f71d34afd1ba0c7f65bed7d45b103ad233.tar.xz
systemd-7af002f71d34afd1ba0c7f65bed7d45b103ad233.zip
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
Diffstat (limited to 'units')
-rw-r--r--units/systemd-rfkill.socket3
1 files changed, 2 insertions, 1 deletions
diff --git a/units/systemd-rfkill.socket b/units/systemd-rfkill.socket
index c8e9f71bf6..9d408903bb 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