Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19941/F-19 Modified Files: xorg-x11-drv-nvidia-304xx.spec Log Message: Add GRUB_GFXPAYLOAD_LINUX=text by default Index: xorg-x11-drv-nvidia-304xx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19/xorg-x11-drv-nvidia-304xx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xorg-x11-drv-nvidia-304xx.spec 3 Jun 2013 21:14:56 -0000 1.2 +++ xorg-x11-drv-nvidia-304xx.spec 7 Jun 2013 19:15:04 -0000 1.3 @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia-304xx Version: 304.88 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -248,6 +248,10 @@ ISGRUB1="" if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then ISGRUB1="--grub" + GFXPAYLOAD="vga=normal" + else + echo "GRUB_GFXPAYLOAD_LINUX=text" >> %{_sysconfdir}/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg fi if [ -x /sbin/grubby ] ; then KERNELS=`/sbin/grubby --default-kernel` @@ -257,7 +261,7 @@ for kernel in ${KERNELS} ; do /sbin/grubby $ISGRUB1 \ --update-kernel=${kernel} \ - --args="nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off vga=normal" \ + --args="nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off $GFXPAYLOAD" \ &>/dev/null done fi @@ -269,6 +273,10 @@ ISGRUB1="" if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then ISGRUB1="--grub" + GFXPAYLOAD="vga=normal" + else + echo "GRUB_GFXPAYLOAD_LINUX=text" >> %{_sysconfdir}/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg fi if [ -x /sbin/grubby ] ; then KERNELS=`/sbin/grubby --default-kernel` @@ -278,7 +286,7 @@ for kernel in ${KERNELS} ; do /sbin/grubby $ISGRUB1 \ --update-kernel=${kernel} \ - --args="nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off vga=normal" \ + --args="nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off $GFXPAYLOAD" \ &>/dev/null done fi @@ -368,6 +376,9 @@ %changelog +* Fri Jun 07 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 304.88-3 +- Add GRUB_GFXPAYLOAD_LINUX=text by default + * Sun Jun 02 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 304.88-2 - Use triggerpostun to re-introduce boot options on rename - Avoid to use gfxpayload