head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.1.0.4
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.2
	pkgsrc-2012Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.10.19.04.15.22;	author manu;	state dead;
branches;
next	1.1;

1.1
date	2012.06.16.01.47.34;	author manu;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Bump to glusterfs-3.3.1, which brings
- unified file and object storage
- storage for Hadoop (not tested here)
- proactive self-healing
- much better performance
@
text
@$NetBSD: patch-cf,v 1.1 2012/06/16 01:47:34 manu Exp $

Strip "-o stuff" from volfile_loc
--- xlators/mount/fuse/utils/mount.glusterfs.in.orig	2012-06-16 03:23:37.000000000 +0200
+++ xlators/mount/fuse/utils/mount.glusterfs.in	2012-06-16 03:25:02.000000000 +0200
@@@@ -191,9 +191,9 @@@@
     log_server=$(echo "$options" | sed -n 's/.*log-server=\([^,]*\).*/\1/p');
 
     log_server_port=$(echo "$options" | sed -n 's/.*log-server-port=\([^,]*\).*/\1/p');
 
-    volfile_loc="$1";
+    volfile_loc=$(echo "$@@" | sed -n 's/-o[ ]*\([^ ]*\)//p'|awk '{print $1}');
 
     [ -r "$volfile_loc" ] || {
 	server_ip=$(echo "$volfile_loc" | sed -n 's/\([^\:]*\).*/\1/p');
         test_str=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p');
@


1.1
log
@Update glusterfs to 3.2.7, a maintenance release
@
text
@d1 1
a1 1
$NetBSD$
@