[Pvfs2-cvs] commit by slang in pvfs2/src/apps/admin: pvfs2-genconfig

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/apps/admin
In directory parlweb1:/tmp/cvs-serv10545/src/apps/admin

Modified Files:
      Tag: pvfs-2-6-branch
	pvfs2-genconfig 
Log Message:
stick the TroveMethod changes in the 2.6 branch.  Includes better doc and not adding the TroveMethod by default in genconfig.



Index: pvfs2-genconfig
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-genconfig,v
diff -p -u -r1.63 -r1.63.6.1
--- pvfs2-genconfig	18 Oct 2006 19:34:11 -0000	1.63
+++ pvfs2-genconfig	6 Dec 2006 00:55:13 -0000	1.63.6.1
@@ -23,7 +23,7 @@ my $opt_metaservers = '';
 my $opt_logfile = '';
 my $opt_storage = '';
 my $opt_trovesync = '1';
-my $opt_trovemethod = 'dbpf';
+my $opt_trovemethod = '';
 my $opt_quiet = '';
 my $opt_logging = '';
 my $opt_logstamp = '';
@@ -199,7 +199,6 @@ sub emit_defaults
     print $target "\tClientJobFlowTimeoutSecs $client_job_timeout\n";
     print $target "\tClientRetryLimit 5\n";
     print $target "\tClientRetryDelayMilliSecs 2000\n";
-    print $target "\tTroveMethod $opt_trovemethod\n";
 
     print $target "</Defaults>\n";
 }
@@ -288,6 +287,11 @@ sub emit_filesystem
         print $target "\t\tTroveSyncData no\n";
         print $target "\t\tCoalescingHighWatermark infinity\n";
         print $target "\t\tCoalescingLowWatermark 1\n";
+    }
+
+    if($opt_trovemethod ne "")
+    {
+        print $target "\t\tTroveMethod $opt_trovemethod\n";
     }
 
     print $target "\t</StorageHints>\n";