Land b_release_1_4_6 onto HEAD (20060223_1429)

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

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 583c895..3d81a29 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -167,21 +167,26 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
        depmod -ae %{kversion} || exit 0
 fi
 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
+
+# for update from < v1.4.6
+
+for f in /etc/modules.conf /etc/modprobe.conf /etc/modprobe.conf.local ; 
+do
+       if [ -f $f ]; then
+               if ! grep 'lustre llite' $f >/dev/null 2>/dev/null ; then
+                       cat >> $f <<-EOF

 alias lustre llite
 EOF
 alias lustre llite
 EOF

-               break
+               fi
+               if egrep "^[^#]*(add below|install) ptlrpc" $f ; then
+                       [ ! -f $f.rpmsave ] && cp $f $f.rpmsave
+                       TMPFILE=`mktemp $f.XXXXXX` && \
+                       sed -e "s/^[^#]*\(add below\|install\) ptlrpc.*/#&/" $f > $TMPFILE && \
+                       mv $TMPFILE $f
+               fi

        fi
 done
        fi
 done

-f=/etc/modules.conf
-if [ -f $f ] && ! grep llite $f >/dev/null 2>/dev/null ; then
-       cat >> $f <<EOF
-alias lustre llite
-EOF
-fi
+

 
 %postun modules
 if [ -f /boot/System.map-%{kversion} ]; then
 
 %postun modules
 if [ -f /boot/System.map-%{kversion} ]; then