[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-4-6-gf23d6b0

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit d00ff096cc092719092a886f023d168d48badd6d
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Wed Aug 4 15:48:26 2010 +0200

    Do not return error if /etc/dkms/framework.conf is missing (LP: #613407)
    
    Thanks: pasadrul

diff --git a/debian/patches/framework_conf.patch b/debian/patches/framework_conf.patch
new file mode 100644
index 0000000..e97a0f4
--- /dev/null
+++ b/debian/patches/framework_conf.patch
@@ -0,0 +1,12 @@
+Do not return error if /etc/dkms/framework.conf is missing
+--- a/dkms_autoinstaller
++++ b/dkms_autoinstaller
+@@ -53,7 +53,7 @@ uname=`uname -mr`
+ arch=${uname#* }
+ kernel_preparation_done=""
+ dkms_tree="/var/lib/dkms"
+-. /etc/dkms/framework.conf 2>/dev/null
++[ -e /etc/dkms/framework.conf ] && . /etc/dkms/framework.conf 2>/dev/null
+ 
+ # See how we were called.
+ case "$1" in
diff --git a/debian/patches/series b/debian/patches/series
index 460be7c..e71f190 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-system-tmpdir.patch
 remove-old-mod.patch
 skip-non-matching-kernel.patch
 debian-lsb.patch
+framework_conf.patch

-- 
Dynamic Kernel Module Support