[systemd-commits] 2 commits - rules/99-systemd.rules.in units/systemd-logind.service.in units/systemd-rfkill at .service.in

[Lennart Poettering]

 rules/99-systemd.rules.in        |    2 +-
 units/systemd-logind.service.in  |    1 -
 units/systemd-rfkill at .service.in |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 812bd1e6ab4c463507557f2bdbb8875fedd92ade
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 21 01:20:57 2014 +0100

    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 e30d9a8..b66d727 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 at .service.in b/units/systemd-rfkill at .service.in
index 0e9851b..b48efe5 100644
--- a/units/systemd-rfkill at .service.in
+++ b/units/systemd-rfkill at .service.in
@@ -9,6 +9,7 @@
 Description=Load/Save RF Kill Switch Status of %I
 Documentation=man:systemd-rfkill at .service(8)
 DefaultDependencies=no
+BindsTo=sys-subsystem-rfkill-devices-%i.device
 RequiresMountsFor=/var/lib/systemd/rfkill
 Conflicts=shutdown.target
 After=systemd-remount-fs.service

commit eab459bc0639b81b32735f36d3e929e4bfa2cb4b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 21 01:17:52 2014 +0100

    Revert "systemd-logind.service: set Type=notify"
    
    This reverts commit a4962513c555fe3ac4b5bebf97a71701361a45b0.
    
    logind.service is a D-Bus service, hence we should use the dbus name as
    indication that we are up. Type=dbus is implied if BusName= is
    specified, as it is in this case.
    
    This removes a warning that is printed because a BusName= is specified
    for a Type=notify unit.

diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index b9fbc2c..f087e99 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -19,7 +19,6 @@ Wants=dbus.socket
 After=dbus.socket
 
 [Service]
-Type=notify
 ExecStart=@rootlibexecdir@/systemd-logind
 Restart=always
 RestartSec=0