summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-12-09 04:18:21 +0100
committerKay Sievers <kay.sievers@vrfy.org>2008-12-09 04:18:21 +0100
commit2fc635fb67dbd509f4ee532c8bf0d3885cc71989 (patch)
tree46d6dff7eefd8d0d1f6fb5a154f8615d5646caa2
parent4fbf41c01835212c3a791b40cfcfccce58c21afd (diff)
rules: move aoe rules to default rules file
-rw-r--r--rules/packages/40-aoe.rules9
-rw-r--r--rules/rules.d/50-udev-default.rules3
2 files changed, 2 insertions, 10 deletions
diff --git a/rules/packages/40-aoe.rules b/rules/packages/40-aoe.rules
deleted file mode 100644
index 4c01442e1c..0000000000
--- a/rules/packages/40-aoe.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# aoe char devices
-SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k", GROUP="disk", MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k", GROUP="disk", MODE="0440"
-SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k", GROUP="disk", MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k", GROUP="disk", MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="flush", NAME="etherd/%k", GROUP="disk", MODE="0220"
-
-# aoe block devices
-SUBSYSTEM=="aoe", KERNEL=="etherd*", NAME="%k", GROUP="disk"
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index ad725fc34f..0f27982d85 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -87,7 +87,8 @@ KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k"
KERNEL=="pktcdvd", NAME="pktcdvd/control"
KERNEL=="qft0", SYMLINK+="ftape"
SUBSYSTEM=="bsg", NAME="bsg/%k"
-SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk"
+SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
# network
KERNEL=="tun", NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"