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

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 137ffe2613b08f564dac5a455f96ecf4a30cd752
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Tue May 19 23:34:27 2009 +0200

    minor fix for an "echo" message

diff --git a/debian/patches/08-use-update-initramfs.patch b/debian/patches/08-use-update-initramfs.patch
index 006d10d..4a5ffd6 100644
--- a/debian/patches/08-use-update-initramfs.patch
+++ b/debian/patches/08-use-update-initramfs.patch
@@ -19,18 +19,17 @@ with update-initramfs no need to check for do_bootloader and lilo.
 -            mkinitrd='update-initramfs'
 -        fi
 -    fi
--
+ 
 -    # Support initramfs distributions (Ubuntu).
 -    if [ -x "/usr/sbin/mkinitramfs" ]; then
 -        mkinitrd='mkinitramfs'
-+
 +    # Support initramfs distributions (Debian/Ubuntu).
 +    if [ -x "/usr/sbin/update-initramfs" ]; then
 +	    mkinitrd='update-initramfs'
      fi
  
      $mkinitrd --version >/dev/null 2>&1
-@@ -262,9 +249,7 @@ function remake_initrd()
+@@ -262,12 +249,10 @@ 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)"
@@ -40,7 +39,11 @@ with update-initramfs no need to check for do_bootloader and lilo.
 +	if [ "$mkinitrd" == "update-initramfs" ]; then
  		invoke_command "$mkinitrd -u" "$mkinitrd" background
  	else
- 		echo $"Saving old initrd as $initrd_dir/initrd.img_old-$1"
+-		echo $"Saving old initrd as $initrd_dir/initrd.img_old-$1"
++		echo $"Saving old initrd as $initrd_dir/initrd.img-$1.bak"
+ 		# we use the same convention as update-initramfs, so that we just
+ 		# print the warning once
+ 		cp -f "$initrd_dir/initrd.img-$1" "$initrd_dir/initrd.img-$1.bak"
 @@ -281,11 +266,6 @@ function remake_initrd()
  	exitval="$?"
      fi

-- 
Maintainance of the dkms package