diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-15 10:41:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-15 10:41:48 +0200 |
| commit | e6fce62e8ff0bdb90a7e6bc3cc224bdabcd20a24 (patch) | |
| tree | be7ad5844280dfaaae5be11497923aa72155d237 /community/nbd | |
| parent | 1d953269cf1d33902f0a61e4cb50ed8ed2895874 (diff) | |
| parent | f06b9295f0e60a0faa0d3231a0d0b3f2358d8459 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/stone-soup/PKGBUILD
extra/maxima/PKGBUILD
multilib/wine/PKGBUILD
testing/rpcbind/PKGBUILD
Diffstat (limited to 'community/nbd')
| -rw-r--r-- | community/nbd/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/nbd/config | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index dc71d02de..1ee6a35e6 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68323 2012-03-21 16:50:13Z svenstaro $ +# $Id: PKGBUILD 69320 2012-04-13 16:10:58Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,7 +6,7 @@ pkgname=nbd pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP." arch=('i686' 'x86_64' 'mips64el') url="http://nbd.sourceforge.net" @@ -17,7 +17,7 @@ backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install md5sums=('81f549155267536ad30851eb50ee8d1c' - '075be420c3d7d7fc9408def3cb8c470d' + '2d05d426b8c2708d5f8a0d028fcbae05' 'e7b13a8b3369e11927d9917664557efa') build(){ diff --git a/community/nbd/config b/community/nbd/config index f90c36b23..777f0ef24 100644 --- a/community/nbd/config +++ b/community/nbd/config @@ -1,4 +1,3 @@ -# This is a comment [generic] # The [generic] section is required, even if nothing is specified # there. @@ -7,9 +6,18 @@ # _before_ opening files. user = nbd group = nbd + # Since version 2.9.17, nbd-server will do exports on a name + # basis (the used name is the name of the section in which the + # export is specified). This however required an incompatible + # protocol change. To enable backwards-compatible port-based + # exports, uncomment the following line: + # oldstyle = true [export1] exportname = /export/nbd/export1-file - port = 12345 + # The following line will be ignored unless the + # "oldstyle = true" line in the generic section above is + # enabled. + #port = 12345 authfile = /export/nbd/export1-authfile timeout = 30 filesize = 10000000 @@ -20,5 +28,6 @@ postrun = rm -f %s [otherexport] exportname = /export/nbd/experiment - port = 12346 - # The other options are all optional. + # The other options are all optional, except this one in case + # the oldstyle option is used in [generic]: + # port = 12346 |