rpms/xorg-x11-drv-nvidia/F-14 nvidia-init, 1.3, 1.4 xorg-x11-drv-nvidia.spec, 1.48, 1.49
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11262/F-14
Modified Files:
nvidia-init xorg-x11-drv-nvidia.spec
Log Message:
- Improve uninstallation script rfbz#1398
- Fix selinux context on device creation rfbz#1421
Index: nvidia-init
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/nvidia-init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-init 31 Oct 2009 12:07:18 -0000 1.3
+++ nvidia-init 24 Oct 2010 17:20:25 -0000 1.4
@@ -43,6 +43,7 @@
if action $"Checking for module $modname:" test -f $module;then
action $"Enabling the $name driver:" $exec enable
RETVAL=$?
+ [ -e /sbin/restorecon ] && /sbin/restorecon /dev/nvidia{ctl,0,1,2,3}
else
echo -en $"$modname for kernel $(uname -r) was not found." &&
echo_warning;echo -en '\n'
echo -en $"The $name driver will not be enabled until one is found."
&& echo_warning;echo -en '\n'
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xorg-x11-drv-nvidia.spec 19 Oct 2010 12:46:15 -0000 1.48
+++ xorg-x11-drv-nvidia.spec 24 Oct 2010 17:20:25 -0000 1.49
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 260.19.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -250,7 +250,7 @@
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0
rdblacklist=nouveau' &>/dev/null
fi
-fi
+fi || :
if [ -x /usr/sbin/setsebool ] ; then
SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
@@ -263,9 +263,20 @@
%preun
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
- test -f %{_sbindir}/nvidia-config-display &&
%{_sbindir}/nvidia-config-display disable &>/dev/null ||:
- %{_initrddir}/nvidia stop &> /dev/null ||:
- /sbin/chkconfig --del nvidia ||:
+ test -f %{_sbindir}/nvidia-config-display &&
%{_sbindir}/nvidia-config-display disable &>/dev/null
+ %{_initrddir}/nvidia stop &>/dev/null
+ /sbin/chkconfig --del nvidia &>/dev/null
+ #Clear grub option to disable nouveau for all kernels
+ if [ -x /sbin/grubby ] ; then
+ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby --update-kernel=${kernel} \
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset'
&>/dev/null
+ done
+ fi
+ #Backup and disable previously used xorg.conf
+ [ -f %{_sysconfdir}/X11/xorg.conf ] && \
+ mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled
&>/dev/null
fi ||:
%postun libs -p /sbin/ldconfig
@@ -318,8 +329,9 @@
%changelog
-* Tue Oct 19 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.12-2
-- Rebuilt for repository mess
+* Sun Oct 24 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.12-3
+- Improve uninstallation script rfbz#1398
+- Fix selinux context on device creation rfbz#1421
* Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.12-1
- Update to 260.19.12