[SCM] live-boot branch, debian-next, updated. debian/2.0_a4-1-7-g483618e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 483618ea14fed6eac02eb15a590aac67b5ded701
Author: Michal <hramrach at centrum.cz>
Date:   Thu Jun 3 20:26:57 2010 +0200

    Updating docs wrt/ httpfs.

diff --git a/docs/parameters.txt b/docs/parameters.txt
index 60ad650..a9ef77c 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -9,6 +9,7 @@ live access=ACCESS
 live console=TTY,SPEED
 live debug
 live fetch=URL
+live httpfs=URL
 live hostname=HOSTNAME
 live username=USER
 live userfullname=USERFULLNAME
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 8788297..c7139da 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -32,14 +32,29 @@ Set the accessibility level for physically or visually impared users. ACCESS mus
 Set the default console to be used with the "live\-getty" option. Example: "console=ttyS0,115200"
 .IP "\fBdebug\fR" 4
 Makes initramfs boot process more verbose.
+.br
+Use: debug=1
+.br
+Without setting debug to a value the messages may not be shown.
 .IP "\fBfetch\fR=\fIURL\fR" 4
-Another form of netboot by downloading a squashfs image from a given url, 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.
+.IP "\fBhttpfs\fR=\fIURL\fR" 4
+Another form of netboot by downloading a squashfs image from a given url.
+The fetch method copies the image to ram and the httpfs method uses fuse and
+httpfs2 to mount the image in place. Copying to ram requires more memory and
+might take a long time for large images. However, it is more likely to work
+correctly because it does not require networking afterwards and the system
+operates faster once booted because it does not require to contact the server
+anymore.
+.br
+Due to current limitations in busyboxs wget and DNS resolution, an URL can not contain a hostname but an IP only.
 .br
 Not working: http://example.com/path/to/your_filesystem.squashfs
 .br
 Working: http://1.2.3.4/path/to/your_filesystem.squashfs
 .br
 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.
+.br
+You may also use the live iso image in place of the squashfs image.
 .IP "\fBignore_uuid\fR" 4
 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs.
 .IP "\fBintegrity\-check\fR" 4

-- 
live-boot