[Pkg-dkms-commits] [SCM] Maintainance of the dkms package branch, master, updated. debian/2.0.21.1-1-8-g6fe5f53

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 6fe5f5376ba6a4a99c41fd1c0b24d83184c74cf4
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Sun May 17 18:33:26 2009 +0200

    debian/patches/08-support_kernel-img.conf.patch: Use update-initramfs, it is the default in Debian/Ubuntu and it also computes and stores some checksums. (Closes: #529038)
    
    No need to use the low-level tool mkinitramfs, update-initramfs is a wrapper and
    it also computes and stores some checksums.
    
    with update-initramfs no need to check for lilo and do_bootloader in /etc/kernel-img.conf.

diff --git a/debian/patches/08-support_kernel-img.conf.patch b/debian/patches/08-support_kernel-img.conf.patch
deleted file mode 100644
index 893c563..0000000
--- a/debian/patches/08-support_kernel-img.conf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Use mkinitramfs only if ramdisk is not set in /etc/kernel-img.conf.
---- a/dkms
-+++ b/dkms
-@@ -215,15 +215,13 @@ function remake_initrd()
-                        -e "s/['\"]*//g" \
-                        /etc/kernel-img.conf | \
-                    awk '{print $1}')
--    else
--        if type update-initramfs >/dev/null 2>&1; then
--            mkinitrd='update-initramfs'
--        fi
-     fi
- 
-     # Support initramfs distributions (Ubuntu).
--    if [ -x "/usr/sbin/mkinitramfs" ]; then
--        mkinitrd='mkinitramfs'
-+    if [-z "$mkinitrd" ] || [ "$mkinitrd" == "mkinitrd" ]; then
-+	    if [ -x "/usr/sbin/mkinitramfs" ]; then
-+		    mkinitrd='mkinitramfs'
-+	    fi
-     fi
- 
-     $mkinitrd --version >/dev/null 2>&1
diff --git a/debian/patches/08-use-update-initramfs.patch b/debian/patches/08-use-update-initramfs.patch
new file mode 100644
index 0000000..744b4b1
--- /dev/null
+++ b/debian/patches/08-use-update-initramfs.patch
@@ -0,0 +1,57 @@
+Use update-initramfs, it is the default in Debian/Ubuntu and it also computes and stores some checksums.
+with update-initramfs no need to check for do_bootloader and lilo.
+--- a/dkms
++++ b/dkms
+@@ -207,23 +207,12 @@ function remake_initrd()
+     local exitval="0"
+     local mkinitrd='mkinitrd'
+ 
+-    # Support /etc/kernel-img.conf (Debian)
+-    if [ -f "/etc/kernel-img.conf" ]; then
+-        # we use the first one listed
+-        mkinitrd=$(sed -e '/^\s*ramdisk/!d' \
+-                       -e 's/^\s*ramdisk\s*=\s*\(.*\)/\1/' \
+-                       -e "s/['\"]*//g" \
+-                       /etc/kernel-img.conf | \
+-                   awk '{print $1}')
+-    else
+-        if type update-initramfs >/dev/null 2>&1; then
+-            mkinitrd='update-initramfs'
+-        fi
+-    fi
+-
+-    # Support initramfs distributions (Ubuntu).
+-    if [ -x "/usr/sbin/mkinitramfs" ]; then
+-        mkinitrd='mkinitramfs'
++    
++    # Support initramfs distributions (Debian/Ubuntu).
++    if [-z "$mkinitrd" ] || [ "$mkinitrd" == "mkinitrd" ]; then
++	    if [ -x "/usr/sbin/update-initramfs" ]; then
++		    mkinitrd='update-initramfs'
++	    fi
+     fi
+ 
+     $mkinitrd --version >/dev/null 2>&1
+@@ -262,9 +251,7 @@ function remake_initrd()
+ 	echo $"Updating initrd"
+ 	echo $"Making new initrd as $initrd_dir/initrd.img-$1"
+ 	echo $"(If next boot fails, revert to the .bak initrd image)"
+-	if [ -f "/etc/initramfs-tools/update-initramfs.conf" ] && \
+-	   ! ( grep ^update_initramfs /etc/initramfs-tools/update-initramfs.conf | grep -qi no ) && \
+-	   [ "$mkinitrd" == "update-initramfs" ]; then
++	if [ "$mkinitrd" == "update-initramfs" ]; then
+ 		invoke_command "$mkinitrd -u" "$mkinitrd" background
+ 	else
+ 		echo $"Saving old initrd as $initrd_dir/initrd.img_old-$1"
+@@ -281,11 +268,6 @@ function remake_initrd()
+ 	exitval="$?"
+     fi
+ 
+-    # Rerun lilo if necessary
+-    if  [ ! -e /etc/kernel-img.conf ] || ( grep ^do_bootloader /etc/kernel-img.conf |  grep -qi yes  ) && [ -e /etc/lilo.conf ]; then
+-	invoke_command "/sbin/lilo" "Updating lilo"
+-    fi
+-
+     return $exitval
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 53c3fb3..e4373fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-08-support_kernel-img.conf.patch
+08-use-update-initramfs.patch
 15_modprobe.patch

-- 
Maintainance of the dkms package