diff --git a/hyper-v.changes b/hyper-v.changes index 56e44f3..2f3ed70 100644 --- a/hyper-v.changes +++ b/hyper-v.changes @@ -19,6 +19,12 @@ Mon Mar 26 19:05:48 CEST 2012 - ohering@suse.de - update hv_kvp_daemon to 3.4-rc1 state use a copy linux/hyperv.h to compile the daemon +------------------------------------------------------------------- +Thu Dec 8 17:46:21 CET 2011 - ohering@suse.de + +- do not package modprobe.conf rule in main package + prevents loading of ata_piix which is required for cdrom access + ------------------------------------------------------------------- Fri Nov 18 21:49:57 CET 2011 - ohering@suse.de diff --git a/hyper-v.spec b/hyper-v.spec index 8db7dc0..ba30877 100644 --- a/hyper-v.spec +++ b/hyper-v.spec @@ -17,6 +17,7 @@ %define with_kmp 0 +%define with_modprobe 0 %if %{with_kmp} %define with_drivers_in_kmp 0 %endif @@ -127,16 +128,20 @@ install -m755 %{hv_kvp_daemon} $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/%{hv_kvp_daemon} ln -sfvbn ../../etc/init.d/%{hv_kvp_daemon} $RPM_BUILD_ROOT/usr/sbin/rc%{hv_kvp_daemon} +%if %{with_modprobe} mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d install -m644 %SOURCE1 $RPM_BUILD_ROOT/etc/modprobe.d/hyperv_pvdrivers.conf +%endif %files %defattr (-,root,root) %doc kvptest.ps1.txt +%if %{with_modprobe} %if !%{with_kmp} %dir /etc/modprobe.d %config /etc/modprobe.d/hyperv_pvdrivers.conf %endif +%endif /etc/init.d/%{hv_kvp_daemon} /usr/sbin/rc%{hv_kvp_daemon} /usr/sbin/%{hv_kvp_daemon}