Branch b1_4

[fs/lustre-release.git] / build / lustre.spec.in

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 0f827d5..885b9ee 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -109,7 +109,7 @@ cat >lustre.files <<EOF
 %attr(-, root, root) /usr/sbin/*
 %attr(-, root, root) /usr/bin/*
 %attr(-, root, root) %{_libdir}/lustre/python
-%attr(-, root, root) /usr/share/lustre/examples
+%attr(-, root, root) /usr/share/lustre/*
 
 %attr(-, root, root) /etc/init.d/lustre
 %attr(-, root, root) /etc/init.d/lustrefs
@@ -123,14 +123,17 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) /etc/openldap/slapd-lustre.conf
 %attr(-, root, root) /etc/openldap/schema/lustre.schema
-%attr(-, root, root) /usr/share/lustre/lustre2ldif.xsl
-%attr(-, root, root) /usr/share/lustre/top.ldif
 EOF
-if [ -f $RPM_BUILD_ROOT/usr/lib/liblustre.so ] ; then
+if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
   echo '%attr(-, root, root) %{_libdir}/liblustre.a' >>lustre.files
   echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files
 fi
 
+if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
+  echo '%attr(-, root, root) %{_libdir}/lustre/snmp' >>lustre.files
+  echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>lustre.files
+fi
+
 %files -f lustre.files
 
 %files modules
@@ -170,6 +173,27 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
        depmod -ae %{kversion} || exit 0
 fi
+for ext in .local "" ; do
+       f=/etc/modprobe.conf$ext
+       if [ -f $f ] && ! grep llite $f >/dev/null 2>/dev/null ; then
+               cat >> $f <<EOF
+install kptlrouter modprobe portals ; modprobe --ignore-install kptlrouter
+install ptlrpc modprobe ksocknal ; modprobe --ignore-install ptlrpc
+install llite modprobe lov osc ; modprobe --ignore-install llite
+alias lustre llite
+EOF
+               break
+       fi
+done
+f=/etc/modules.conf
+if [ -f $f ] && ! grep llite $f >/dev/null 2>/dev/null ; then
+       cat >> $f <<EOF
+add below kptlrouter portals
+add below ptlrpc ksocknal
+add below llite lov osc
+alias lustre llite
+EOF
+fi
 
 %postun modules
 if [ -f /boot/System.map-%{kversion} ]; then