From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Nov 2014 00:20:57 +0000 (+0100)
Subject: units: make sure rfkill service is bount to the actual hardware
X-Git-Tag: v218~402
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=812bd1e6ab4c463507557f2bdbb8875fedd92ade

units: make sure rfkill service is bount to the actual hardware
---

diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index e30d9a8f1..b66d727a4 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -62,7 +62,7 @@ SUBSYSTEM=="leds", KERNEL=="*kbd_backlight", TAG+="systemd", IMPORT{builtin}="pa
 
 # Pull in rfkill save/restore for all rfkill devices
 
-SUBSYSTEM=="rfkill", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-rfkill@$name.service"
+SUBSYSTEM=="rfkill", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_ALIAS}+="/sys/subsystem/rfkill/devices/%k", ENV{SYSTEMD_WANTS}+="systemd-rfkill@$name.service"
 
 # Asynchronously mount file systems implemented by these modules as
 # soon as they are loaded.
diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in
index 0e9851bf2..b48efe5d9 100644
--- a/units/systemd-rfkill@.service.in
+++ b/units/systemd-rfkill@.service.in
@@ -9,6 +9,7 @@
 Description=Load/Save RF Kill Switch Status of %I
 Documentation=man:systemd-rfkill@.service(8)
 DefaultDependencies=no
+BindsTo=sys-subsystem-rfkill-devices-%i.device
 RequiresMountsFor=/var/lib/systemd/rfkill
 Conflicts=shutdown.target
 After=systemd-remount-fs.service