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 e30d9a8f1bbdefd13735e201e2290af0f1ce0c2b..b66d727a48711316978a7242ef30ed9dd4dda46c 100644 (file)
--- 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
 
 
 # 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.
 
 # 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 0e9851bf2e0f40ca1089b45b981f4466b5e8a06f..b48efe5d99539bf0ad00840dd3c8ef1f6ee70290 100644 (file)
--- 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
 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
 RequiresMountsFor=/var/lib/systemd/rfkill
 Conflicts=shutdown.target
 After=systemd-remount-fs.service