From 812bd1e6ab4c463507557f2bdbb8875fedd92ade Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 21 Nov 2014 01:20:57 +0100 Subject: [PATCH] units: make sure rfkill service is bount to the actual hardware --- rules/99-systemd.rules.in | 2 +- units/systemd-rfkill@.service.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in index e30d9a8f1bb..b66d727a487 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 0e9851bf2e0..b48efe5d995 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