Adding upstream version 1.154.7.

diff --git a/hooks/live b/hooks/live
index 8a1be02..f2984f4 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -149,9 +149,6 @@ else
 fi
 copy_exec /usr/bin/udevinfo /bin
 
-# Program: wc
-copy_exec /usr/bin/wc /bin
-
 # Program: wget
 if [ -x /usr/bin/wget ]
 then

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 687a939..ecf9db5 100644 (file)
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -54,7 +54,15 @@ Makes initramfs boot process more verbose.
   fetch=*URL*::
 
 Another form of netboot by downloading a squashfs image from a given url,
-copying to ram and booting it.
+copying to ram and booting it. Due to current limitations in busyboxs wget
+and DNS resolution, an URL can not contain a hostname but an IP only.
+
+Not working: http://example.com/path/to/your_filesystem.squashfs
+Working: http://1.2.3.4/path/to/your_filesystem.squashfs
+
+Also note that therefore it's currently not possible to fetch an image from a
+namebased virtualhost of an httpd if it is sharing the ip with the main httpd
+instance.
 
   hostname=*HOSTNAME*, username=*USER*, userfullname=*USERFULLNAME*::