rpms/kvm/devel kvm.modules,NONE,1.1 kvm.spec,1.9,1.10

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32621

Modified Files:
	kvm.spec 
Added Files:
	kvm.modules 
Log Message:
* Mon Mar 26 2007 Jeremy Katz <katzj at redhat.com> - 15-2
- add file so that kvm modules get loaded on boot



--- NEW FILE kvm.modules ---
#!/bin/sh

if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then 
    modprobe kvm-intel >/dev/null 2>&1
fi

if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then 
    modprobe kvm-amd >/dev/null 2>&1
fi


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kvm.spec	7 Mar 2007 20:34:15 -0000	1.9
+++ kvm.spec	26 Mar 2007 21:16:26 -0000	1.10
@@ -1,11 +1,12 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 15
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
+Source1: kvm.modules
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # qemu doesn't build with gcc 4.x
@@ -16,6 +17,7 @@
 BuildRequires: texi2html
 # kvm kernel side is only x86/x86_64 as that's where the hardware is
 ExclusiveArch: %{ix86} x86_64
+Requires: initscripts >= 8.08-1
 
 %description
 KVM (for Kernel-based Virtual Machine) is a full virtualization solution 
@@ -56,6 +58,9 @@
 
 mv $RPM_BUILD_ROOT/%{_bindir}/qemu* $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
 
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -65,8 +70,12 @@
 %{_bindir}/qemu-kvm
 %{_mandir}/man*/*
 %{_datadir}/kvm
+%{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Mon Mar 26 2007 Jeremy Katz <katzj at redhat.com> - 15-2
+- add file so that kvm modules get loaded on boot
+
 * Wed Mar  7 2007 Jeremy Katz <katzj at redhat.com> - 15-1
 - update to kvm-15