rpms/kexec-tools/F-11 kexec-tools.spec, 1.135, 1.136 mkdumprd, 1.28, 1.29

[Neil Horman]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4162

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz521186


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/kexec-tools.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- kexec-tools.spec	31 Aug 2009 12:33:01 -0000	1.135
+++ kexec-tools.spec	4 Sep 2009 12:54:25 -0000	1.136
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@ done
 
 
 %changelog
+* Fri Sep 04 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-15
+- Fix inclusion of stata_nv in initramfs (bz 521186)
+
 * Mon Aug 31 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-14
 - Update firstboot so it works properly (bz 508167)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/mkdumprd,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mkdumprd	27 Aug 2009 19:58:57 -0000	1.28
+++ mkdumprd	4 Sep 2009 12:54:25 -0000	1.29
@@ -1077,6 +1077,17 @@ if [ -n "$CORE_COLLECTOR" -a ! -e /sys/k
 fi
 
 #include extra user-specified modules for kdump initrd
+#EXTRA HACK:
+#sata_nv doesn't seem to have any path for me to detect it in sys
+#nor does it seem to wind up listed in any module dep chain 
+#so lets just check for it here via lsmod, and if we find it, assume we need it
+#
+lsmod | grep -q sata_nv
+if [ $? == 0 ]
+then
+   extra_kdump_mods="$extra_kdump_mods stata_nv"
+fi 
+
 for n in $extra_kdump_mods; do
     findmodule $n
 done