[Pvfs2-cvs] commit by pcarns in pvfs2-1/examples/heartbeat: PVFS2

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/examples/heartbeat
In directory parlweb1:/tmp/cvs-serv6370/examples/heartbeat

Modified Files:
      Tag: small-file-branch
	PVFS2 
Log Message:
merge trunk updates down to small-file-branch.  Passes basic tests but needs
some double checking of pint-cached-config and sys-create conflicts.


Index: PVFS2
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/examples/heartbeat/PVFS2,v
diff -p -u -r1.1.6.2 -r1.1.6.3
--- PVFS2	24 Jun 2008 15:01:10 -0000	1.1.6.2
+++ PVFS2	7 Aug 2008 16:30:12 -0000	1.1.6.3
@@ -40,8 +40,8 @@ fi
 #
 #######################################################################
 #
-PVFS2D=/usr/sbin/pvfs2-server
-PVFS2CHECK=/usr/bin/pvfs2-check-server
+PVFS2D=/usr/local/sbin/pvfs2-server
+PVFS2CHECK=/usr/local/bin/pvfs2-check-server
 
 
 #	End of Configuration options
@@ -129,7 +129,7 @@ start_pvfs2() {
   ulimit -n 100000 && ulimit -c unlimited
 
   # try to create storage space (ok if it fails)
-  $PVFS2D $OCF_RESKEY_fsconfig -f
+  $PVFS2D $OCF_RESKEY_fsconfig -a $OCF_RESKEY_alias -f
 
   # launch daemon
   ocf_run $PVFS2D -p $OCF_RESKEY_pidfile -a $OCF_RESKEY_alias $OCF_RESKEY_fsconfig