[Pkg-dkms-commits] [SCM] Maintainance of the dkms package branch, master, updated. debian/2.0.21.0-1-20-g171907c

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 171907c6a1b567cf4fa422d37c9ccc42881cd7ba
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Thu Apr 30 18:21:34 2009 +0200

    debian/postinst: if /etc/modprobe.d/dkms is modified, put its content in /etc/modprobe.d/dkms.conf and remove it.
    Updated changelog

diff --git a/debian/changelog b/debian/changelog
index cc0ce18..c11a458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,9 +20,8 @@ dkms (2.0.21.1-1) unstable; urgency=low
     time). Use instead (and create if necessary)
     /etc/modprobe.d/package_name.conf. (Closes: #525379)
   * [3fac4cc] debian/postinst: Remove /etc/modprobe.d/dkms on upgrade
-    only if unmodified
 
- -- Giuseppe Iuculano <giuseppe at iuculano.it>  Wed, 22 Apr 2009 15:03:34 +0200
+ -- Giuseppe Iuculano <giuseppe at iuculano.it>  Thu, 30 Apr 2009 18:20:40 +0200
 
 dkms (2.0.21.0-1) unstable; urgency=low
 
diff --git a/debian/postinst b/debian/postinst
index d3955ac..63f498c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,6 +10,10 @@ if [ "$1" = upgrade ]; then
 			then
 				rm -f "/etc/modprobe.d/dkms"
 			fi
+		else
+			echo "Moving /etc/modprobe.d/dkms to /etc/modprobe.d/dkms.conf"
+			grep -v '^#' /etc/modprobe.d/dkms >> /etc/modprobe.d/dkms.conf
+			rm -f "/etc/modprobe.d/dkms"
 		fi
 	fi
 fi

-- 
Maintainance of the dkms package