From: Wouter Verhelst Date: Thu, 30 Apr 2009 12:37:51 +0000 (+0200) Subject: More build fixes X-Git-Url: http://git.alex.org.uk More build fixes these let 'make distcheck' work again. --- diff --git a/Makefile.am b/Makefile.am index 0165f45..e1a58b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,15 +12,15 @@ nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ nbd_server_LDADD = @GLIB_LIBS@ nbd_tester_client_LDADD = @GLIB_LIBS@ man_MANS = nbd-server.1 nbd-server.5 nbd-client.8 -EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml nbd-server.5.sgml gznbd -MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1 -nbd-server.1.in: nbd-server.1.sgml +EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml nbd-server.5.sgml gznbd simple_test +MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1 nbd-server.5 +nbd-server.1.in: $(srcdir)/nbd-server.1.sgml LC_ALL=C docbook2man nbd-server.1.sgml mv NBD-SERVER.1 nbd-server.1.in -nbd-client.8: nbd-client.8.sgml +nbd-client.8.in: $(srcdir)/nbd-client.8.sgml LC_ALL=C docbook2man nbd-client.8.sgml - mv NBD-CLIENT.8 nbd-client.8 -nbd-server.5.in: nbd-server.5.sgml + mv NBD-CLIENT.8 nbd-client.8.in +nbd-server.5.in: $(srcdir)/nbd-server.5.sgml LC_ALL=C docbook2man nbd-server.5.sgml mv NBD-SERVER.5 nbd-server.5.in dist-hook: diff --git a/configure.ac b/configure.ac index 51787db..7839040 100644 --- a/configure.ac +++ b/configure.ac @@ -169,6 +169,6 @@ AC_SUBST(sbin_PROGRAMS) nbd_server_CPPFLAGS=$nbd_server_CPPFLAGS" -DSYSCONFDIR='\"$sysconfdir\"'" AC_SUBST(nbd_server_CPPFLAGS) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([Makefile Doxyfile nbd-server.1 nbd-server.5]) +AC_CONFIG_FILES([Makefile Doxyfile nbd-server.1 nbd-server.5 nbd-client.8]) AC_OUTPUT diff --git a/nbd-client.8.in b/nbd-client.8.in new file mode 100644 index 0000000..025b991 --- /dev/null +++ b/nbd-client.8.in @@ -0,0 +1,135 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng . +.TH "NBD-CLIENT" "8" "30 April 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 \fB-d \fInbd-device\fB\fR + + +\fBnbd-client\fR \fB-c \fInbd-device\fB\fR + +.SH "DESCRIPTION" +.PP +With \fBnbd-client\fR, you can connect to a +server running \fBnbd-server\fR, thus using raw +diskspace from that server as a blockdevice on the local +client. +.PP +To do this, support from the Linux Kernel is necessary, in +the form of the Network Block Device (NBD). When you have that, +either in the kernel, or as a module, you can connect to an NBD +server and use its exported file through a block special file with +major mode 43. +.SH "OPTIONS" +.PP +The following options are supported: +.TP +\fBbs=\fIblocksize\fB\fR +Use a blocksize of "blocksize". Default is 1024; +allowed values are either 512, 1024, 2048 or 4096 +.TP +\fBhost\fR +The hostname of the machine running +\fBnbd-server\fR\&. +.TP +\fBtimeout=\fIseconds\fB\fR +Set the connection timeout to "seconds". For this to +work, you need a kernel with support for the NBD_SET_TIMEOUT +ioctl; this was introduced into Linus' tree on 2007-10-11, +and will be part of kernel 2.6.24. +.TP +\fBport\fR +The TCP port on which \fBnbd-server\fR is +running at the server. +.TP +\fBnbd-device\fR +The block special file this nbd-client should connect +to. +.TP +\fB-c\fR +Check whether the specified nbd device is +connected. + +If the device is connected, nbd-client will exit +with an exit state of 0 and print the PID of the nbd-client +instance that connected it to stdout. + +If the device is not +connected or does not exist (for example because the nbd +module was not loaded), nbd-client will exit with an exit +state of 1 and not print anything on stdout. + +If an error occurred, nbd-client will exit with an exit +state of 2, and not print anything on stdout either. +.TP +\fB-d\fR +Disconnect the specified nbd device from the +server +.TP +\fB-persist\fR +When this option is specified, nbd-client will +immediately try to reconnect an nbd device if the +connection ever drops unexpectedly due to a lost +server or something similar. +.TP +\fB-sdp\fR +Connect to the server using the Socket Direct Protocol +(SDP), rather than IP. See nbd-server(1) for details. +.TP +\fB-swap\fR +Specifies that this NBD device will be used as +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 +.SH "EXAMPLES" +.PP +Some examples of nbd-client usage: +.TP 0.2i +\(bu +To connect to a server running on port 2000 at host +"server.domain.com", using the client's block special file +"/dev/nb0": + +\fBnbd-client server.domain.com 2000 +/dev/nb0\fR +.TP 0.2i +\(bu +To connect to a server running on port 2001 at host +"swapserver.domain.com", using the client's block special +file "/dev/nb1", for swap purposes: + +\fBnbd-client swapserver.domain.com 2001 /dev/nb1 +-swap\fR +.TP 0.2i +\(bu +To disconnect the above connection again (after making +sure the block special file is not in use anymore): + +\fBnbd-client -d /dev/nb1\fR +.SH "SEE ALSO" +.PP +nbd-server (1). +.SH "AUTHOR" +.PP +The NBD kernel module and the NBD tools have been written by +Pavel Macheck (pavel@ucw.cz). +.PP +The kernel module is now maintained by Paul Clements +(Paul.Clements@steeleye.com), while the userland tools are maintained by +Wouter Verhelst (wouter@debian.org) +.PP +This manual page was written by Wouter Verhelst () for +the Debian GNU/Linux system (but may be used by others). Permission is +granted to copy, distribute and/or modify this document under the +terms of the GNU General Public License, +version 2, as published by the Free Software Foundation. diff --git a/simple_test b/simple_test index 4b6b521..ddaa86e 100755 --- a/simple_test +++ b/simple_test @@ -9,7 +9,7 @@ dd if=/dev/zero of=$tmpnam bs=1024 count=1024 echo $1 case $1 in - ./cmd) + */cmd) # Test with export specified on command line ./nbd-server -C /dev/null -p `pwd`/nbd-server.pid 11111 $tmpnam & # -p only works if nbd-server wasn't compiled with -DNOFORK or @@ -20,7 +20,7 @@ case $1 in retval=$? ;; - ./cfg1) + */cfg1) # Test with export specified in config file cat > nbd-server.conf <nbd-server.conf <