summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-07-14 02:02:35 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-07-14 02:02:35 +0200
commitc874e22e0da6f87aa72ade635f11421e6ecb6e48 (patch)
treeecf2b34607249f54a7732d681cc40f36c60c2784 /extras
parent1985c76e48753c200b5a15630b00245c3f60775b (diff)
udev-acl: skip ACLs when systemd is running, disable by default
Diffstat (limited to 'extras')
-rw-r--r--extras/udev-acl/70-udev-acl.rules (renamed from extras/udev-acl/70-acl.rules)3
1 files changed, 3 insertions, 0 deletions
diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-udev-acl.rules
index 5dc5ed0bfc..2dac283101 100644
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-udev-acl.rules
@@ -6,6 +6,9 @@
ENV{MAJOR}=="", GOTO="acl_end"
ACTION=="remove", GOTO="acl_apply"
+# systemd replaces udev-acl entirely, skip if active
+TEST=="/sys/fs/cgroup/systemd", TAG=="uaccess", GOTO="acl_end"
+
# PTP/MTP protocol devices, cameras, portable media players
SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="udev-acl"