From: cliffw <cliffw>
Date: Thu, 15 Dec 2005 01:00:42 +0000 (+0000)
Subject: Changes for 1.4.6 so modprobe.conf is updated correctly and ptlrpc is
X-Git-Tag: v1_7_100~1^103~4^2~157
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e9dd1a0f42ca56bdc26d4f347061029baa1c51df;p=fs%2Flustre-release.git

Changes for 1.4.6 so modprobe.conf is updated correctly and ptlrpc is
commented out. From Andreas
r=cliffw
---

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 4b13804..2fe308e 100644
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -173,21 +173,26 @@ 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
+
+# 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
-		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
-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