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 (file)
index 4c01442..0000000
--- 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 ad725fc34f99ba56a1fe7a745650737acdaff352..0f27982d85df721bc5dd4bcdbe433cf786c16a05 100644 (file)
--- 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"