From eb07f624b6859e3cdba9c236f70130cb3c201fa8 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 26 Jan 2012 00:47:24 +0000
Subject: [PATCH 2/2] udev: Rename udev rules and add uaccess & udev-acl tags.

The udev rules have to be applied before level 73 when the ACL
rules will be processed. The current level of 98 was too late,
so move them to 70 along with the official 70-uaccess.rules.

Normally this config should be kept inside systemd, but as
cuse is a userspace system, it make more sense to keep it
separate.
---
 70-osscuse.rules |    7 +++++++
 98-osscuse.rules |    7 -------
 Makefile         |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 70-osscuse.rules
 delete mode 100644 98-osscuse.rules

diff --git a/70-osscuse.rules b/70-osscuse.rules
new file mode 100644
index 0000000..318743e
--- /dev/null
+++ b/70-osscuse.rules
@@ -0,0 +1,7 @@
+# Since these devices are not part of 'sound' subsystem the group is forced
+# to audio by name
+# /dev/cuse can stay  mode 0660 root:root since osspd is run as root
+# and drops privileges to user level when opened by user
+KERNEL=="dsp", GROUP="audio", TAG+="uaccess", TAG+="udev-acl"
+KERNEL=="mixer", GROUP="audio", TAG+="uaccess", TAG+="udev-acl"
+KERNEL=="adsp", GROUP="audio", TAG+="uaccess", TAG+="udev-acl"
diff --git a/98-osscuse.rules b/98-osscuse.rules
deleted file mode 100644
index c1430fd..0000000
--- a/98-osscuse.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Since these devices are not part of 'sound' subsystem the group is forced
-# to audio by name
-# /dev/cuse can stay  mode 0660 root:root since osspd is run as root
-# and drops privileges to user level when opened by user
-KERNEL=="dsp", GROUP="audio"
-KERNEL=="mixer", GROUP="audio"
-KERNEL=="adsp", GROUP="audio"
diff --git a/Makefile b/Makefile
index b22b596..39cf114 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ install:
 	mkdir -p $(DESTDIR)$(sbindir)
 	install -m755 osspd ossp-padsp ossp-alsap $(DESTDIR)$(sbindir)
 	mkdir -p $(DESTDIR)$(UDEVDIR)
-	install -m644 98-osscuse.rules $(DESTDIR)$(UDEVDIR)
+	install -m644 70-osscuse.rules $(DESTDIR)$(UDEVDIR)
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sound.target.wants
 	install -m644 osspd.service $(DESTDIR)$(systemdsystemunitdir)
 	( cd $(DESTDIR)$(systemdsystemunitdir)/sound.target.wants && \
-- 
1.7.8.3