Document -noswap option

diff --git a/nbd-client.8.in b/nbd-client.8.in
index 025b991..f7a915f 100644 (file)
--- a/nbd-client.8.in
+++ b/nbd-client.8.in
@@ -3,13 +3,13 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "NBD-CLIENT" "8" "30 April 2009" "" ""
+.TH "NBD-CLIENT" "8" "24 May 2009" "" ""
 
 .SH NAME
 nbd-client \- connect to a server running nbd-server(1), to use its    exported block device
 .SH SYNOPSIS
 
-\fBnbd-client\fR [ \fBbs=\fIblocksize\fB\fR ] [ \fBtimeout=\fIseconds\fB\fR ] \fB\fIhost\fB\fR \fB\fIport\fB\fR \fB\fInbd-device\fB\fR [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ]
+\fBnbd-client\fR [ \fBbs=\fIblocksize\fB\fR ] [ \fBtimeout=\fIseconds\fB\fR ] \fB\fIhost\fB\fR \fB\fIport\fB\fR \fB\fInbd-device\fB\fR [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] [ \fB-nofork\fR ]
 
 
 \fBnbd-client\fR \fB-d \fInbd-device\fB\fR
@@ -91,6 +91,10 @@ swapspace. If you intend to do that, please use this
 option to prevent deadlocks. You'll need a special kernel
 patch, available at NBD's homepage:
 http://atrey.karlin.mff.cuni.cz/~pavel
+.TP
+\fB-nofork\fR
+Specifies that the NBD client should not detach and
+daemonize itself. This is mostly useful for debugging.
 .SH "EXAMPLES"
 .PP
 Some examples of nbd-client usage:

diff --git a/nbd-client.8.sgml b/nbd-client.8.sgml
index 8d2f5d0..27e11fa 100644 (file)
--- a/nbd-client.8.sgml
+++ b/nbd-client.8.sgml
@@ -63,6 +63,7 @@ manpage.1: manpage.sgml
       <arg><option>-sdp</option></arg>
       <arg><option>-swap</option></arg>
       <arg><option>-persist</option></arg>
+      <arg><option>-nofork</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&dhpackage;</command>
@@ -181,6 +182,12 @@ manpage.1: manpage.sgml
            http://atrey.karlin.mff.cuni.cz/~pavel</para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>-nofork</option></term>
+       <listitem>
+         <para>Specifies that the NBD client should not detach and
+         daemonize itself. This is mostly useful for debugging.</para>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>

diff --git a/nbd-client.c b/nbd-client.c
index 73ce456..13f0dde 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -218,7 +218,7 @@ int main(int argc, char *argv[]) {
        if (argc < 3) {
        errmsg:
                fprintf(stderr, "nbd-client version %s\n", PACKAGE_VERSION);
-               fprintf(stderr, "Usage: nbd-client [bs=blocksize] [timeout=sec] host port nbd_device [-swap] [-persist]\n");
+               fprintf(stderr, "Usage: nbd-client [bs=blocksize] [timeout=sec] host port nbd_device [-swap] [-persist] [-nofork]\n");
                fprintf(stderr, "Or   : nbd-client -d nbd_device\n");
                fprintf(stderr, "Or   : nbd-client -c nbd_device\n");
                fprintf(stderr, "Default value for blocksize is 1024 (recommended for ethernet)\n");