[Pkg-dkms-commits] [SCM] Maintenance of the dkms package branch, master, updated. upstream/2.0.20.4-12-gd6470ee

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit d6470ee5e61c76decfb14e27a285c1fa07501a0e
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Thu Dec 25 10:43:45 2008 +0100

    debian/patches/09-lilo_detection.patch: check /etc/kernel-img.conf to find if user is using grub
    
    Just because there's a GRUB configuration present doesn't mean LILO
    isn't installed.  This should check /etc/kernel-img.conf to find out
    what to do.

diff --git a/debian/patches/09-lilo_detection.patch b/debian/patches/09-lilo_detection.patch
new file mode 100644
index 0000000..3411316
--- /dev/null
+++ b/debian/patches/09-lilo_detection.patch
@@ -0,0 +1,12 @@
+check /etc/kernel-img.conf to find if user is using grub
+--- a/dkms
++++ b/dkms
+@@ -255,7 +255,7 @@
+     fi
+ 
+     # Rerun lilo if necessary
+-    if ! [ -e /boot/grub/grub.conf ] && [ -e /etc/lilo.conf ] && ! [ -e /boot/grub/menu.lst ]; then
++    if ( grep ^postinst_hook /etc/kernel-img.conf |  grep -q grub ) && [ -e /etc/lilo.conf ]; then
+ 	invoke_command "/sbin/lilo" "Updating lilo"
+     fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3bc0b99..2426c50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06-fakeroot.patch
 07-exit-if-build-fails.patch
 08-use_update-initramfs.patch
+09-lilo_detection.patch

-- 
Maintenance of the dkms package