aboutsummaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorXiang Fan <sfanxiang@gmail.com>2017-08-08 01:41:15 -0500
committerLennart Poettering <lennart@poettering.net>2017-08-08 08:41:15 +0200
commit5aece00d459e7a38178cfcd9f2d8767434840071 (patch)
tree7fe20cae5c53e2ebfe58c113fb12f5aff4c97679 /rules
parentbuild-sys: Fix Makefile wrapper for install target (#6548) (diff)
downloadsystemd-5aece00d459e7a38178cfcd9f2d8767434840071.tar.gz
systemd-5aece00d459e7a38178cfcd9f2d8767434840071.tar.bz2
systemd-5aece00d459e7a38178cfcd9f2d8767434840071.zip
rules: split the rfkill subsystem rule (#6556)
This patch makes sure both rules are applied to rfkill devices. Otherwise the ENV rule may be skipped if path_id fails. Fixes: #6528
Diffstat (limited to 'rules')
-rw-r--r--rules/99-systemd.rules.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index edd1faa17..62f0b98cd 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -63,7 +63,8 @@ SUBSYSTEM=="backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_W
SUBSYSTEM=="leds", KERNEL=="*kbd_backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@leds:$name.service"
# Pull in rfkill save/restore for all rfkill devices
-SUBSYSTEM=="rfkill", ENV{SYSTEMD_RFKILL}="1", IMPORT{builtin}="path_id"
+SUBSYSTEM=="rfkill", ENV{SYSTEMD_RFKILL}="1"
+SUBSYSTEM=="rfkill", IMPORT{builtin}="path_id"
SUBSYSTEM=="misc", KERNEL=="rfkill", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-rfkill.socket"
# Asynchronously mount file systems implemented by these modules as soon as they are loaded.