From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Mon, 20 Dec 2004 21:24:19 +0000 (+0100)
Subject: [PATCH] add SUBSYSTEM rule to catch all block devices and apply the disk permissions
X-Git-Tag: 051~31
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=87da5b2c65e0a889093c27189212505328aea4ab

[PATCH] add SUBSYSTEM rule to catch all block devices and apply the disk permissions
---

diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index dbb0e6f51..d89d8d0a2 100644
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -207,6 +207,9 @@ KERNEL="diskonkey*",	NAME="%k", GROUP="disk"
 # rem_ide devices
 KERNEL="microdrive*",	NAME="%k", GROUP="disk"
 
+# all block devices
+SUBSYSTEM="block",	NAME="%k", GROUP="disk"
+
 # kbd devices
 KERNEL="kbd",		NAME="%k", MODE="0664"
 
diff --git a/etc/udev/redhat/udev.rules b/etc/udev/redhat/udev.rules
index d394e9901..30d8ba7c9 100644
--- a/etc/udev/redhat/udev.rules
+++ b/etc/udev/redhat/udev.rules
@@ -104,7 +104,7 @@ KERNEL="sr[0-9]*", BUS="scsi", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-
 KERNEL="sr[0-9]*", BUS="scsi", NAME="scd%n", GROUP="disk", MODE="0640"
 KERNEL="hd[a-z]*", BUS="ide", SYSFS{removable}="1", NAME{ignore_remove}="%k", GROUP="disk", MODE="0640"
 
-KERNEL="hd[a-z]*", NAME="%k", GROUP="disk", MODE="0640"
-KERNEL="sd[a-z]*", NAME="%k", GROUP="disk", MODE="0640"
+# all block devices
+SUBSYSTEM="block",	NAME="%k", GROUP="disk", MODE="0640"
 
 KERNEL="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c"
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 53eee3545..bc8c4560d 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -215,7 +215,7 @@ EOF
 #\\
 
 KERNEL="ttyUSB0", \\
-NAME="visor"
+	NAME="visor"
 
 EOF
 	},