X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=30fdce8ba5f948173c716e41553c826133f5d11e;hp=9121ecf77f999205a844299ace02fa91cf296ad9;hb=dcd1a836ce8c15b50e1ff8d8264d74af9efec915;hpb=40a9a45986a1aea37683b85075fb802b4d6919f3

diff --git a/lustre.spec.in b/lustre.spec.in
index 9121ecf..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}
@@ -243,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