X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=30fdce8ba5f948173c716e41553c826133f5d11e;hb=1d433bfd4ce2973cacbce703ec98a4c268e9b38e;hp=6722587166795a923f09f3b3f298d07217ab3bdb;hpb=36bc496616547ab020cd53d7b00ba70e9c7f8567;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 6722587..30fdce8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -6,7 +6,7 @@
 
 %define is_client %(bash -c "if [[ %{lustre_name} = *-client ]]; then echo -n '1'; else echo -n '0'; fi")
 # for those uses that don't want the -smp/-bigsmp on the end of %kversion
-%define krequires %(bash -c "echo %{kversion} | sed -e 's/-[^0-9]*smp$//'")
+%define krequires %(bash -c "echo %{kversion} | sed -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
 Summary: Lustre File System
 Name: %{lustre_name}
@@ -87,6 +87,8 @@ to be used by the Lustre testing framework.
 
 %prep
 %setup -qn lustre-%{version}
+ln lustre/ChangeLog ChangeLog-lustre
+ln lnet/ChangeLog ChangeLog-lnet
 
 %build
 # if RPM_BUILD_NCPUS unset, set it
@@ -193,6 +195,8 @@ popd >/dev/null
 
 %files modules -f lustre-modules.files
 %attr(-, root, root) %doc COPYING
+%attr(-, root, root) %doc ChangeLog-lustre
+%attr(-, root, root) %doc ChangeLog-lnet
 
 %files source
 %attr(-, root, root) /usr/src/lustre-%{version}
@@ -239,6 +243,21 @@ do
 	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.
+if sysctl kernel.unsupported >/dev/null 2>&1 &&
+   [ "$(sysctl -n kernel.unsupported 2>/dev/null)" = "0" ] &&
+    ! modprobe -c | grep -q "^allow_unsupported_modules[ \t]1" ; then
+     echo "
+     warning: the Lustre modules are not supported by Novell. To use Lustre
+              on this system, you should put
+
+     allow_unsupported_modules 1
+
+     into /etc/modprobe.d/unsupported_modules"
+fi
+
 %postun modules
 if [ -f /boot/System.map-%{kversion} ]; then
 	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0