Index: SPECS/nvidia173.spec =================================================================== --- SPECS/nvidia173.spec (revision 642214) +++ SPECS/nvidia173.spec (working copy) @@ -468,16 +468,18 @@ %if %{mdkversion} >= 200710 install -d -m755 %{buildroot}%{_sysconfdir}/modprobe.d touch %{buildroot}%{_sysconfdir}/modprobe.d/display-driver.conf -echo "alias nvidia %{modulename}" > %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.conf -echo "blacklist nouveau" >> %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.conf +echo "install nvidia /sbin/modprobe %{modulename} \$CMDLINE_OPTS" > %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.conf %endif +%if %{mdkversion} < 201100 # modprobe.preload.d # This is here because sometimes (one case reported by Christophe Fergeau on 04/2010) # starting X server fails if the driver module is not already loaded. +# This is fixed by the reworked kms-dkms-plymouth-drakx-initrd system in 2011.0. install -d -m755 %{buildroot}%{_sysconfdir}/modprobe.preload.d touch %{buildroot}%{_sysconfdir}/modprobe.preload.d/display-driver echo "%{modulename}" > %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.preload +%endif # XvMCConfig install -d -m755 %{buildroot}%{nvidia_xvmcconfdir} @@ -549,8 +551,10 @@ %endif %if %{mdkversion} >= 200710 --slave %{_sysconfdir}/modprobe.d/display-driver.conf display-driver.conf %{_sysconfdir}/%{drivername}/modprobe.conf \ +%if %{mdkversion} < 201100 --slave %{_sysconfdir}/modprobe.preload.d/display-driver display-driver.preload %{_sysconfdir}/%{drivername}/modprobe.preload \ %endif +%endif %if %{mdkversion} >= 200910 --slave %{xorg_extra_modules} xorg_extra_modules %{nvidia_extensionsdir} \ %else @@ -622,10 +626,14 @@ %ghost %{_sysconfdir}/ld.so.conf.d/GL.conf %ghost %{_sysconfdir}/X11/xinit.d/nvidia-settings.xinit %ghost %{_sysconfdir}/modprobe.d/display-driver.conf +%if %{mdkversion} < 201100 %ghost %{_sysconfdir}/modprobe.preload.d/display-driver +%endif %dir %{_sysconfdir}/%{drivername} %{_sysconfdir}/%{drivername}/modprobe.conf +%if %{mdkversion} < 201100 %{_sysconfdir}/%{drivername}/modprobe.preload +%endif %{_sysconfdir}/%{drivername}/ld.so.conf %{_sysconfdir}/%{drivername}/XvMCConfig %{_sysconfdir}/%{drivername}/nvidia-settings.xinit