From: Christopher J. Morrone <morrone2@llnl.gov>
Date: Sat, 19 Feb 2011 01:52:43 +0000 (-0800)
Subject: Remove rpm spec code and message related to "alias lustre llite"
X-Git-Tag: 2.0.59-llnl2-base~19^2
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F264%2F1;p=fs%2Flustre-release.git

Remove rpm spec code and message related to "alias lustre llite"

It has been quite some time since we used the module alias:

  alias lustre llite

Remove conversion code from the spec file.
Remove the confusing error message that make reference to the alias.

Change-Id: I412ce738243e3d9824b4a94f8a4fd95811cfae0d
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index 51a4f45..c81e335 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -310,28 +310,6 @@ and Training offerings please visit
 http://www.sun.com/software/products/lustre/lustre_reg.jsp
 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
-			[ ! -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.
diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index db01c28..2f30df9 100644
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -720,9 +720,8 @@ int main(int argc, char *const argv[])
                         usource, target, strerror(errno));
                 if (errno == ENODEV)
                         fprintf(stderr, "Are the lustre modules loaded?\n"
-                                "Check /etc/modprobe.conf and /proc/filesystems"
-                                "\nNote 'alias lustre llite' should be removed"
-                                " from modprobe.conf\n");
+                                "Check /etc/modprobe.conf and "
+                                "/proc/filesystems\n");
                 if (errno == ENOTBLK)
                         fprintf(stderr, "Do you need -o loop?\n");
                 if (errno == ENOMEDIUM)