added conf file to set import/export options. fixed gnbdtab processing.

Package-Manager: portage-2.0.51.19

7 files changed, 37 insertions, 13 deletions

diff --git a/sys-cluster/gnbd/ChangeLog b/sys-cluster/gnbd/ChangeLog
index 1b5367763cca..55ead853d0f7 100644
--- a/sys-cluster/gnbd/ChangeLog
+++ b/sys-cluster/gnbd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/gnbd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.9 2005/10/07 18:08:54 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/ChangeLog,v 1.10 2005/10/07 19:48:57 xmerlin Exp $
+
+  07 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org> +files/gnbd-client.conf,
+  files/gnbd-client.rc, +files/gnbd-srv.conf, files/gnbd-srv.rc,
+  gnbd-1.00.00-r1.ebuild:
+  added conf file to set import/export options. 
+
+  07 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gnbd-client.rc,
+  files/gnbd-srv.rc:
+  fixed gnbdtab processing. Thanks to Jan Bruvoll <jan@bruvoll.com>.
 
   07 Oct 2005; Christian Zoffoli <xmerlin@gentoo.org> gnbd-1.00.00-r1.ebuild:
   fixed a typo, closed bug #108361. Thanks to Jan Bruvoll <jan@bruvoll.com>.
diff --git a/sys-cluster/gnbd/Manifest b/sys-cluster/gnbd/Manifest
index b61193a13093..dc7f3ccd246d 100644
--- a/sys-cluster/gnbd/Manifest
+++ b/sys-cluster/gnbd/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 58191e4655469984cafedaef64668666 ChangeLog 1463
+MD5 c2b147975107452be07da9e5b5ab21ab ChangeLog 1851
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 8a4ed42fce0a638c79e2e70101be2aad gnbd-1.00.00-r1.ebuild 970
-MD5 ba721cd9cf6ac2d3c91b2b18c4f67456 files/gnbd-client.rc 2723
-MD5 dcb5af2eba55a19193d93220f9fa3399 files/gnbd-srv.rc 1947
+MD5 24fd2baa02ee93de45719958f1e24368 gnbd-1.00.00-r1.ebuild 1060
+MD5 4fa6e5f8e0d5600e324cc3dda0273559 files/gnbd-client.rc 2745
+MD5 b62daccfc63de43c6e67333ff4eea04e files/gnbd-srv.rc 1967
 MD5 a96ced2be5dbc837a2d23bd3fbecaa12 files/gnbd.devfs 332
 MD5 79b84f9fc4b7bdee59dd1211663aef8d files/gnbdtab 177
 MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-gnbd-1.00.00-r1 68
+MD5 a94865e8c419db5f9d2f455e61db1a49 files/gnbd-client.conf 243
+MD5 3347be217818ecf129f40e26a0e2bf75 files/gnbd-srv.conf 237
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDRrnOgMUyd/cdjWsRAkL0AKCHnWhdJnJwRMQHg2PXxMNq81pmxwCdEVRL
-JA1AhilmoEv+oHLOaiO1Vv4=
-=4g8e
+iD8DBQFDRtGYgMUyd/cdjWsRAqF1AKCL3QH+UiZ7igFoEwXSghmcYUBbrQCbBRyl
+3LDbYHGbvv2Sy79wRwQmO8w=
+=gT1H
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/gnbd/files/gnbd-client.conf b/sys-cluster/gnbd/files/gnbd-client.conf
new file mode 100644
index 000000000000..5952f4e7af5d
--- /dev/null
+++ b/sys-cluster/gnbd/files/gnbd-client.conf
@@ -0,0 +1,5 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-client.conf,v 1.1 2005/10/07 19:48:57 xmerlin Exp $
+
+GNBD_CLIENT_OPTS=""
diff --git a/sys-cluster/gnbd/files/gnbd-client.rc b/sys-cluster/gnbd/files/gnbd-client.rc
index 042c0fefa606..b952c75e4269 100755
--- a/sys-cluster/gnbd/files/gnbd-client.rc
+++ b/sys-cluster/gnbd/files/gnbd-client.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-client.rc,v 1.4 2005/03/25 02:17:29 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-client.rc,v 1.5 2005/10/07 19:48:57 xmerlin Exp $
 
 depend() {
 	use dns logger
@@ -45,7 +45,7 @@ start() {
 	if [ -n "$GNBD" ] ; then
 		ebegin "Importing all GNBDs devices"
 		einfo "$(awk '/^import/ { print "--> server:", $2 }' /etc/gnbdtab )"
-		cat /etc/gnbdtab | awk '/^import/ { print "-i", $2 }' | xargs gnbd_import  > /dev/null
+		cat /etc/gnbdtab | awk '/^import/ { print "-i", $2 }' | xargs -l gnbd_import ${GNBD_CLIENT_OPTS} > /dev/null
 		eend $? "Failed to import gnbd devices"
 	fi
 }
diff --git a/sys-cluster/gnbd/files/gnbd-srv.conf b/sys-cluster/gnbd/files/gnbd-srv.conf
new file mode 100644
index 000000000000..e3511f425b4a
--- /dev/null
+++ b/sys-cluster/gnbd/files/gnbd-srv.conf
@@ -0,0 +1,5 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-srv.conf,v 1.1 2005/10/07 19:48:57 xmerlin Exp $
+
+GNBD_SRV_OPTS=""
diff --git a/sys-cluster/gnbd/files/gnbd-srv.rc b/sys-cluster/gnbd/files/gnbd-srv.rc
index f5dbfff356b9..4000e8fd11c7 100755
--- a/sys-cluster/gnbd/files/gnbd-srv.rc
+++ b/sys-cluster/gnbd/files/gnbd-srv.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-srv.rc,v 1.3 2005/03/25 02:17:29 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/files/gnbd-srv.rc,v 1.4 2005/10/07 19:48:57 xmerlin Exp $
 
 depend() {
 	use dns logger
@@ -32,7 +32,7 @@ start() {
 	if [ -n "$GNBD" ] ; then
 		ebegin "Exporting all GNBDs devices"
 		einfo "$(awk '/^export/ { print "--> device:", $4, "as", $3 }' /etc/gnbdtab )"
-		cat /etc/gnbdtab | awk '/^export/ { print "-d", $4, "-e", $3 }' | xargs gnbd_export > /dev/null
+		cat /etc/gnbdtab | awk '/^export/ { print "-d", $4, "-e", $3 }' | xargs -l gnbd_export ${GNBD_SRV_OPTS} > /dev/null
 		eend $? "Failed to export gnbd devices"
 	fi
 }
diff --git a/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild b/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild
index 3e82a0c46132..b02c317dd5ca 100644
--- a/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild
+++ b/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild,v 1.3 2005/10/07 18:08:54 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd/gnbd-1.00.00-r1.ebuild,v 1.4 2005/10/07 19:48:57 xmerlin Exp $
 
 CLUSTER_VERSION="1.00.00"
 DESCRIPTION="GFS Network Block Devices"
@@ -29,6 +29,9 @@ src_install() {
 	newinitd ${FILESDIR}/${PN}-client.rc ${PN}-client || die
 	newinitd ${FILESDIR}/${PN}-srv.rc ${PN}-srv || die
 
+	doconfd ${FILESDIR}/${PN}-client.conf || die
+	doconfd ${FILESDIR}/${PN}-srv.conf || die
+
 	insinto /etc
 	doins ${FILESDIR}/gnbdtab