From a6e094fa87542e13265fd5a97a06d56b61313c98 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Mon, 7 Mar 2011 12:47:05 -0500 Subject: [PATCH] LU-119 Remove code added by a conflict resolution I erroneously re-added some code that was removed in 62345145fa7cae1846f96078bac43ddf58cea640 while resolving a conflict in LU-85's landing of commit ab13b69b63ca19d7fe68b8ba6afd2cb4723db78c. Signed-off-by: Brian J. Murrell Change-Id: Id2489a3aa5560cdf4e7cf4755ddc16437558a2fc Reviewed-on: http://review.whamcloud.com/304 Tested-by: Hudson Reviewed-by: Christopher J. Morrone Reviewed-by: Robert Read Reviewed-by: Oleg Drokin --- lustre.spec.in | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/lustre.spec.in b/lustre.spec.in index ab88d85..d574bcd 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -302,28 +302,6 @@ if [ -x /sbin/weak-modules ]; then /sbin/weak-modules --add-modules fi -# 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 - [ ! -f $f.rpmsave ] && cp $f $f.rpmsave - TMPFILE=`mktemp $f.XXXXXX` && \ - rm -f $TMPFILE && touch $TMPFILE && \ - grep -v 'lustre llite' $f >> $TMPFILE && \ - mv $TMPFILE $f - fi - if egrep "^[^#]*(add below|install) ptlrpc" $f ; then - [ ! -f $f.rpmsave ] && cp $f $f.rpmsave - TMPFILE=`mktemp $f.XXXXXX` && \ - rm -f $TMPFILE && touch $TMPFILE && \ - sed -e "s/^[^#]*\(add below\|install\) ptlrpc.*/#&/" $f >> $TMPFILE && \ - mv $TMPFILE $f - fi - fi -done - # If the kernel was built to reject unsupported modules (e.g. not a Lustre # kernel), and this hasn't been overridden in /etc/modprobe.d yet, then # print a warning so that users are aware of this issue. -- 1.8.3.1