From 55e0a896cf959358f696863cd72c42f913c3222a Mon Sep 17 00:00:00 2001 From: "Ed L. Cashin" Date: Fri, 8 Feb 2008 04:20:02 -0800 Subject: [PATCH] --- yaml --- r: 84702 b: refs/heads/master c: 468fc53050a81d73893ce619a62914799e8d86bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/aoe/udev-install.sh | 5 ++++- trunk/Documentation/aoe/udev.txt | 15 ++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2d697f73dad5..f636cf0f3f5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb0da4cea28ae8f1bbe61822a2cc04e6d074e03 +refs/heads/master: 468fc53050a81d73893ce619a62914799e8d86bb diff --git a/trunk/Documentation/aoe/udev-install.sh b/trunk/Documentation/aoe/udev-install.sh index 6449911c6a71..15e86f58c036 100644 --- a/trunk/Documentation/aoe/udev-install.sh +++ b/trunk/Documentation/aoe/udev-install.sh @@ -23,7 +23,10 @@ fi # /etc/udev/rules.d # rules_d="`sed -n '/^udev_rules=/{ s!udev_rules=!!; s!\"!!g; p; }' $conf`" -if test -z "$rules_d" || test ! -d "$rules_d"; then +if test -z "$rules_d" ; then + rules_d=/etc/udev/rules.d +fi +if test ! -d "$rules_d"; then echo "$me Error: cannot find udev rules directory" 1>&2 exit 1 fi diff --git a/trunk/Documentation/aoe/udev.txt b/trunk/Documentation/aoe/udev.txt index a7ed1dc4f331..17e76c4f918e 100644 --- a/trunk/Documentation/aoe/udev.txt +++ b/trunk/Documentation/aoe/udev.txt @@ -1,6 +1,7 @@ # These rules tell udev what device nodes to create for aoe support. -# They may be installed along the following lines (adjusted to what -# you see on your system). +# They may be installed along the following lines. Check the section +# 8 udev manpage to see whether your udev supports SUBSYSTEM, and +# whether it uses one or two equal signs for SUBSYSTEM and KERNEL. # # ecashin@makki ~$ su # Password: @@ -15,10 +16,10 @@ # # 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=="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" # aoe block devices -KERNEL="etherd*", NAME="%k", GROUP="disk" +KERNEL=="etherd*", NAME="%k", GROUP="disk"