[SCM] live-tools branch, debian, updated. debian/3.0.8-1-5-g2ad2167

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 2ad2167f7ccb0e98e6ebe943f64117f2b667e78d
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Aug 16 12:05:31 2012 +0200

    Renaming divertion for update-initramfs too in order to be consistent with the uptime divertion, eventhouhg it is not required for the the update-initramfs divertion.

diff --git a/bin/live-update-initramfs b/bin/live-update-initramfs
index 686602e..b0adfb6 100755
--- a/bin/live-update-initramfs
+++ b/bin/live-update-initramfs
@@ -10,9 +10,9 @@
 
 set -e
 
-if [ ! -e /usr/sbin/update-initramfs.initramfs-tools ]
+if [ ! -e /usr/sbin/update-initramfs.orig.initramfs-tools ]
 then
-	echo "E: /usr/sbin/update-initramfs.initramfs-tools - command not found"
+	echo "E: /usr/sbin/update-initramfs.orig.initramfs-tools - command not found"
 	echo "E: On Debian based systems, update-initramfs from initramfs-tools"
 	echo "E: can be installed with:"
 	echo "E:   apt-get install initramfs-tools"
@@ -45,7 +45,7 @@ then
 	fi
 else
 	# non-live system
-	/usr/sbin/update-initramfs.initramfs-tools "${@}"
+	/usr/sbin/update-initramfs.orig.initramfs-tools "${@}"
 
 	exit "${?}"
 fi
@@ -53,7 +53,7 @@ fi
 case "${_READ_WRITE}" in
 	true)
 		# Updating initramfs
-		/usr/sbin/update-initramfs.initramfs-tools "${@}"
+		/usr/sbin/update-initramfs.orig.initramfs-tools "${@}"
 
 		# FIXME: needs to exclude initrd backup files
 		if [ "$(ls initrd.img-* | wc -l)" -gt 1 ]
diff --git a/debian/live-tools.postrm b/debian/live-tools.postrm
index 4cf305a..1bb826f 100644
--- a/debian/live-tools.postrm
+++ b/debian/live-tools.postrm
@@ -5,8 +5,8 @@ set -e
 case "${1}" in
 	remove)
 		# initramfs-tools: update-initramfs
-		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/sbin/update-initramfs.initramfs-tools /usr/sbin/update-initramfs
-		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man8/update-initramfs.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/sbin/update-initramfs.orig.initramfs-tools /usr/sbin/update-initramfs
+		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man8/update-initramfs.orig.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
 
 		# procps: uptime
 		dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.orig.procps /usr/bin/uptime
diff --git a/debian/live-tools.preinst b/debian/live-tools.preinst
index e422ff6..cfce37e 100644
--- a/debian/live-tools.preinst
+++ b/debian/live-tools.preinst
@@ -5,8 +5,8 @@ set -e
 case "${1}" in
 	install|upgrade)
 		# initramfs-tools: update-initramfs
-		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/sbin/update-initramfs.initramfs-tools /usr/sbin/update-initramfs
-		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man8/update-initramfs.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
+		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/sbin/update-initramfs.orig.initramfs-tools /usr/sbin/update-initramfs
+		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man8/update-initramfs.orig.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
 
 		# procps: uptime
 		dpkg-divert --package live-tools --quiet --add --rename --divert /usr/bin/uptime.orig.procps /usr/bin/uptime

-- 
live-tools