Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e176758994b18ce0df1d8c66418801e74a83d40f
commit e176758994b18ce0df1d8c66418801e74a83d40f Author: Michel Hermier <[EMAIL PROTECTED]> Date: Thu Feb 28 11:32:46 2008 +0100 nvidia-169.12-2-i686: * Fix removal of modules * Fix corner case of update installing nvidia while updating the kernel. diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 03d5224..8db6a2f 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=169.12 -pkgrel=1 +pkgrel=2 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html"; conflicts=('libgl' 'libglx') diff --git a/source/x11-extra/nvidia/nvidia.install b/source/x11-extra/nvidia/nvidia.install index 7c2fce6..568aa79 100644 --- a/source/x11-extra/nvidia/nvidia.install +++ b/source/x11-extra/nvidia/nvidia.install @@ -15,7 +15,11 @@ post_install() { echo nvidia >> /etc/sysconfig/modules fi /sbin/depmod -ea $_F_kernelmod_uname - /sbin/modprobe nvidia + ## if nvidia dependent kernel is the current kernel + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## Try to load it + /sbin/modprobe nvidia + fi } post_upgrade() { @@ -27,8 +31,8 @@ post_upgrade() { if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then ## see if is loaded , if yes kill it and modprobe again if not do nothing if grep -q nvidia /proc/modules; then - echo -n "Reloading vboxdrv kernel module.." - modprobe -R nvidia + echo -n "Reloading nvidia kernel module.." + modprobe --remove nvidia sleep 1 modprobe nvidia echo " done." @@ -38,7 +42,7 @@ post_upgrade() { pre_remove() { if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - /sbin/rmmod nvidia + /sbin/modprobe --remove nvidia fi if [ -e /etc/X11/xorg.conf ]; then _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
