diff options
| author | Ed L. Cashin <ecashin@coraid.com> | 2008-02-08 07:20:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:31 -0500 |
| commit | 468fc53050a81d73893ce619a62914799e8d86bb (patch) | |
| tree | 6bf9034ca946ae6004d332b810e3758c69af1daa | |
| parent | 1eb0da4cea28ae8f1bbe61822a2cc04e6d074e03 (diff) | |
aoe: clean up udev configuration example
This patch adds a known default location for the udev configuration file and
uses the more recent "==" syntax for SUBSYSTEM and KERNEL.
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | Documentation/aoe/udev-install.sh | 5 | ||||
| -rw-r--r-- | Documentation/aoe/udev.txt | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Documentation/aoe/udev-install.sh b/Documentation/aoe/udev-install.sh index 6449911c6a71..15e86f58c036 100644 --- a/Documentation/aoe/udev-install.sh +++ b/Documentation/aoe/udev-install.sh | |||
| @@ -23,7 +23,10 @@ fi | |||
| 23 | # /etc/udev/rules.d | 23 | # /etc/udev/rules.d |
| 24 | # | 24 | # |
| 25 | rules_d="`sed -n '/^udev_rules=/{ s!udev_rules=!!; s!\"!!g; p; }' $conf`" | 25 | rules_d="`sed -n '/^udev_rules=/{ s!udev_rules=!!; s!\"!!g; p; }' $conf`" |
| 26 | if test -z "$rules_d" || test ! -d "$rules_d"; then | 26 | if test -z "$rules_d" ; then |
| 27 | rules_d=/etc/udev/rules.d | ||
| 28 | fi | ||
| 29 | if test ! -d "$rules_d"; then | ||
| 27 | echo "$me Error: cannot find udev rules directory" 1>&2 | 30 | echo "$me Error: cannot find udev rules directory" 1>&2 |
| 28 | exit 1 | 31 | exit 1 |
| 29 | fi | 32 | fi |
diff --git a/Documentation/aoe/udev.txt b/Documentation/aoe/udev.txt index a7ed1dc4f331..17e76c4f918e 100644 --- a/Documentation/aoe/udev.txt +++ b/Documentation/aoe/udev.txt | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | # These rules tell udev what device nodes to create for aoe support. | 1 | # These rules tell udev what device nodes to create for aoe support. |
| 2 | # They may be installed along the following lines (adjusted to what | 2 | # They may be installed along the following lines. Check the section |
| 3 | # you see on your system). | 3 | # 8 udev manpage to see whether your udev supports SUBSYSTEM, and |
| 4 | # whether it uses one or two equal signs for SUBSYSTEM and KERNEL. | ||
| 4 | # | 5 | # |
| 5 | # ecashin@makki ~$ su | 6 | # ecashin@makki ~$ su |
| 6 | # Password: | 7 | # Password: |
| @@ -15,10 +16,10 @@ | |||
| 15 | # | 16 | # |
| 16 | 17 | ||
| 17 | # aoe char devices | 18 | # aoe char devices |
| 18 | SUBSYSTEM="aoe", KERNEL="discover", NAME="etherd/%k", GROUP="disk", MODE="0220" | 19 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k", GROUP="disk", MODE="0220" |
| 19 | SUBSYSTEM="aoe", KERNEL="err", NAME="etherd/%k", GROUP="disk", MODE="0440" | 20 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k", GROUP="disk", MODE="0440" |
| 20 | SUBSYSTEM="aoe", KERNEL="interfaces", NAME="etherd/%k", GROUP="disk", MODE="0220" | 21 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k", GROUP="disk", MODE="0220" |
| 21 | SUBSYSTEM="aoe", KERNEL="revalidate", NAME="etherd/%k", GROUP="disk", MODE="0220" | 22 | SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k", GROUP="disk", MODE="0220" |
| 22 | 23 | ||
| 23 | # aoe block devices | 24 | # aoe block devices |
| 24 | KERNEL="etherd*", NAME="%k", GROUP="disk" | 25 | KERNEL=="etherd*", NAME="%k", GROUP="disk" |