From c44ca36d60296c9420b08bd502565aff67bcad62 Mon Sep 17 00:00:00 2001
From: Dmitry Zogin <dmitry.zoguine@oracle.com>
Date: Fri, 13 Aug 2010 18:58:43 +0400
Subject: [PATCH] b=21259 udev rule to set /dev/obd perms 666

 i=christopher.morrone
 i=dmitry.zoguine
---
 lustre.spec.in                 |  2 ++
 lustre/autoMakefile.am         |  2 +-
 lustre/autoconf/lustre-core.m4 |  1 +
 lustre/conf/99-lustre.rules    |  1 +
 lustre/conf/Makefile.am        | 12 +++++++-----
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 lustre/conf/99-lustre.rules

diff --git a/lustre.spec.in b/lustre.spec.in
index 7d9347e..44362c8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -176,6 +176,8 @@ cat >lustre.files <<EOF
 %attr(-, root, root) %{_mandir}/man?/*
 
 %attr(-, root, root) %{_libexecdir}/lustre/lc_common
+
+%attr(-, root, root) %{_sysconfdir}/udev/rules.d/99-lustre.rules
 EOF
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 684d0e7..16ea085 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -38,7 +38,7 @@ AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
 ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
-	mgc fid fld doc utils tests scripts autoconf contrib
+	mgc fid fld doc utils tests scripts autoconf contrib conf
 
 SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs
 
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index acc2415..e49b6c8 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2506,6 +2506,7 @@ AC_DEFUN([LC_CONFIG_FILES],
 lustre/Makefile
 lustre/autoMakefile
 lustre/autoconf/Makefile
+lustre/conf/Makefile
 lustre/contrib/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile
diff --git a/lustre/conf/99-lustre.rules b/lustre/conf/99-lustre.rules
new file mode 100644
index 0000000..7a0c6c7
--- /dev/null
+++ b/lustre/conf/99-lustre.rules
@@ -0,0 +1 @@
+KERNEL=="obd", MODE="0666"
diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index e767678..6d6b7fe 100644
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -34,12 +34,14 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-EXTRA_DIST = lustre.dtd lustre.schema slapd-lustre.conf lustre2ldif.xsl top.ldif
+EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \
+             99-lustre.rules
 ldapconfdir = $(sysconfdir)/openldap
-ldapschemadir = $(sysconfdir)/openldap/schema
 
 if UTILS
-ldapconf_SCRIPTS = slapd-lustre.conf
-ldapschema_SCRIPTS = lustre.schema
-pkgdata_DATA = top.ldif lustre2ldif.xsl
+noinst_SCRIPTS = slapd-lustre.conf
+noinst_DATA = top.ldif lustre2ldif.xsl
 endif
+
+udevrulesdir = $(sysconfdir)/udev/rules.d
+udevrules_DATA = 99-lustre.rules
-- 
1.8.3.1