[SCM] live-config branch, debian, updated. debian/2.0_a11-1-4-g8a3631d

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 7b250fa8ec95eb83c2e70633ce9ec1474e1899d4
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 7 13:52:39 2010 +0200

    Updating replacement update-initramfs cope with files being in /boot rather than root.

diff --git a/scripts/config/104-initramfs-tools b/scripts/config/104-initramfs-tools
index f57ce82..4f663ba 100755
--- a/scripts/config/104-initramfs-tools
+++ b/scripts/config/104-initramfs-tools
@@ -46,17 +46,24 @@ cat > /usr/sbin/update-initramfs << 'EOF'
 # Updating initramfs
 update-initramfs.debian "${@}"
 
+if [ -e /initrd.img ]
+then
+	_DIRECTORY=""
+else
+	_DIRECTORY="/boot"
+fi
+
 # Copying kernel and initrd to live media
 if [ -e /cdrom/live/initrd.lz ]
 then
-	zcat /initrd.img | lzma -9c >/cdrom/live/initrd.lz.new
+	zcat "${_DIRECTORY}/initrd.img" | lzma -9c > /cdrom/live/initrd.lz.new
 	mv /cdrom/live/initrd.lz.new /cdrom/live/initrd.lz
 else
-	cp /initrd.img /cdrom/live/initrd.gz.new
+	cp "${_DIRECTORY}/initrd.img" /cdrom/live/initrd.gz.new
 	mv /cdrom/live/initrd.gz.new /cdrom/live/initrd.gz
 fi
 
-cp /vmlinuz /cdrom/live/vmlinuz.new
+cp "${_DIRECTORY}/vmlinuz" /cdrom/live/vmlinuz.new
 mv /cdrom/live/vmlinuz.new /cdrom/live/vmlinuz
 EOF
 

-- 
live-config