rpms/xorg-x11-drv-nvidia/F-12 xorg-x11-drv-nvidia.spec,1.45,1.46

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28912/F-12

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
- Only blacklist nouveau with grubby on install.



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xorg-x11-drv-nvidia.spec	8 Jul 2010 18:54:53 -0000	1.45
+++ xorg-x11-drv-nvidia.spec	8 Jul 2010 19:01:05 -0000	1.46
@@ -278,10 +278,10 @@
   # Add init script and start it
   /sbin/chkconfig --add nvidia ||:
   /etc/init.d/nvidia start &>/dev/null ||:
-fi
-if [ -x /sbin/grubby ] ; then
-  GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
-  /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
+  if [ -x /sbin/grubby ] ; then
+    GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+    /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
+  fi
 fi
 if [ -x /usr/sbin/setsebool ] ; then
   SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
@@ -361,6 +361,7 @@
 %changelog
 * Thu Jul 08 2010 Nicolas Chauvet <kwizart at gmail.com> - 1:195.36.31-2
 - Improve post script as reported in rfbz#1262
+- Only blacklist nouveau with grubby on install.
 
 * Wed Jun 16 2010 Nicolas Chauvet <kwizart at gmail.com> - 1:195.36.31-1
 - Update to 195.36.31