From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 9 Dec 2008 03:18:21 +0000 (+0100)
Subject: rules: move aoe rules to default rules file
X-Git-Tag: 174~1261
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2fc635fb67dbd509f4ee532c8bf0d3885cc71989

rules: move aoe rules to default rules file
---

diff --git a/rules/packages/40-aoe.rules b/rules/packages/40-aoe.rules
deleted file mode 100644
index 4c01442e1..000000000
--- 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 ad725fc34..0f27982d8 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"