[Pkg-fglrx-devel] r384 - fglrx-driver/trunk/debian

[Michael Gilbert]

Author: gilbert-guest
Date: 2010-03-21 20:35:20 +0000 (Sun, 21 Mar 2010)
New Revision: 384

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.postrm
   fglrx-driver/trunk/debian/fglrx-driver.preinst
Log:
blacklist the radeon kernel module

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-03-21 20:35:18 UTC (rev 383)
+++ fglrx-driver/trunk/debian/changelog	2010-03-21 20:35:20 UTC (rev 384)
@@ -6,8 +6,9 @@
   * Remove fglrxrc manpage since there is no fglrxrc binary anymore.
   * Add link to ATI FAQ for supported hardware in fglrx manpage (too hard to
     keep up to date otherwise).
-  * Use automake/autogen to generate manpage build system.
-    - Remove a lot of automatically generated files from packaging.
+  * Use autogen to generate manpage build system.
+    - Remove a lot of files that are automatically generated.
+  * Blacklist the radeon kernel module while fglrx is installed.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 21 Mar 2010 14:49:38 -0400
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postrm	2010-03-21 20:35:18 UTC (rev 383)
+++ fglrx-driver/trunk/debian/fglrx-driver.postrm	2010-03-21 20:35:20 UTC (rev 384)
@@ -15,8 +15,6 @@
 #        * <disappearer's-postrm> 'disappear' <r>overwrit>r> <new-version>
 # for details, see /usr/share/doc/packaging-manual/
 
-
-
 case "$1" in
 
     upgrade|abort-upgrade)
@@ -27,6 +25,9 @@
     ;;
 
 	remove)
+                # remove radeon blacklist
+                rm -f /etc/modprobe.d/fglrx-driver.conf
+
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi

Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2010-03-21 20:35:18 UTC (rev 383)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2010-03-21 20:35:20 UTC (rev 384)
@@ -27,6 +27,10 @@
 
 case "$1" in
     install|upgrade)
+
+        # blacklist radeon module
+        echo "blacklist radeon" > /etc/modprobe.d/fglrx-driver.conf
+
         if dpkg --compare-versions "$2" lt "8.30.3"; then
             prep_mv_conffile /etc/fglrxrc
             prep_mv_conffile /etc/fglrxprofiles.csv