[SCM] debian-live branch, master, updated. debian/1.136.3-1-12-gd0f1544

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d0f15441be347c985276c4a66475cdeff30164bb
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 8 16:12:19 2008 +0200

    Adding tftp-hpa to recommends and including, if existing, /usr/bin/tftp into the initramfs.

diff --git a/debian/bug/script b/debian/bug/script
index 7938bbe..564890c 100644
--- a/debian/bug/script
+++ b/debian/bug/script
@@ -4,7 +4,7 @@
 dpkg -l busybox file initramfs-tools sudo udev user-setup
 
 # Checking recommends
-dpkg -l eject loop-aes-utils uuid-runtime wget
+dpkg -l eject loop-aes-utils tftp uuid-runtime wget
 
 # Checking suggests
 dpkg -l curlftpfs genext2fs httpfs2 squashfs-tools mtd-tools
diff --git a/debian/control b/debian/control
index 2042c92..f185e1e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Upstream-Depends: git-core
 Package: live-initramfs
 Architecture: all
 Depends: ${misc:Depends}, busybox, file, initramfs-tools, sudo, udev, user-setup
-Recommends: eject, loop-aes-utils, uuid-runtime, wget
+Recommends: eject, loop-aes-utils, tftp-hpa, uuid-runtime, wget
 Suggests: curlftpfs, genext2fs (>= 1.4.1), httpfs2, squashfs-tools, mtd-tools
 Description: Debian Live initramfs hook
  live-initramfs is a hook for the initramfs-tools, used to generate a initramfs
diff --git a/hooks/live b/hooks/live
index dea7f0c..078ee45 100755
--- a/hooks/live
+++ b/hooks/live
@@ -140,6 +140,12 @@ else
 fi
 copy_exec /usr/bin/udevinfo /bin
 
+# Program: tftp-hpa
+if [ -z /usr/bin/tftp ]
+then
+	copy_exec /usr/bin/tftp /bin
+fi
+
 # Program: wget
 if [ -x /usr/bin/wget ]
 then

-- 
debian-live