rpms/qemu/F-11 kvm.modules,1.1,1.2 qemu.spec,1.99,1.100

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25338

Modified Files:
	kvm.modules qemu.spec 
Log Message:
* Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-2
- Allow blacklisting of kvm modules (#517866)



Index: kvm.modules
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/kvm.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kvm.modules	4 Mar 2009 00:11:56 -0000	1.1
+++ kvm.modules	18 Aug 2009 10:06:17 -0000	1.2
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then 
-    modprobe kvm-intel >/dev/null 2>&1
+    modprobe -b kvm-intel >/dev/null 2>&1
 fi
 
 if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then 
-    modprobe kvm-amd >/dev/null 2>&1
+    modprobe -b kvm-amd >/dev/null 2>&1
 fi


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- qemu.spec	4 Aug 2009 15:35:42 -0000	1.99
+++ qemu.spec	18 Aug 2009 10:06:17 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -467,6 +467,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-2
+- Allow blacklisting of kvm modules (#517866)
+
 * Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-1
 - Update to qemu-kvm-0.10.6; upstream ChangeLog:
    - merge qemu 0.10.6