[Gfarm-commits] SF.net SVN: gfarm: [3881] gfarm/branches/gfarm_v2/gftool/config-gfarm

[<ta...@us...>]

Revision: 3881
          http://gfarm.svn.sourceforge.net/gfarm/?rev=3881&view=rev
Author:   tatebe
Date:     2007-12-04 23:26:18 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
update gfsd.conf by config-gfsd not config-gfarm in private mode

Modified Paths:
--------------
    gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.in
    gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfsd.in

Modified: gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.in
===================================================================
--- gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.in	2007-12-04 15:44:05 UTC (rev 3880)
+++ gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.in	2007-12-05 07:26:18 UTC (rev 3881)
@@ -561,7 +561,6 @@
 	echo _gfarmfs `whoami` > $USERMAP_FILE
 	cp $GFARM_CONF $GFSD_CONF
 	echo local_user_map $USERMAP_FILE >> $GFMD_CONF
-	echo local_user_map $USERMAP_FILE >> $GFSD_CONF
 fi
 
 # create run scripts

Modified: gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfsd.in
===================================================================
--- gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfsd.in	2007-12-04 15:44:05 UTC (rev 3880)
+++ gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfsd.in	2007-12-05 07:26:18 UTC (rev 3881)
@@ -308,6 +308,18 @@
 # create run scripts
 mkscript $RC_DIR/$RC_NAME	config "$RC_GFSD_IN"
 
+if $PRIVATE_MODE; then
+# only private mode
+
+# update configuration file
+USERMAP_FILE="$GFARM_CONF_DIR/usermap"
+[ -f $USERMAP_FILE ] || ABORT "$USERMAP_FILE: no such file"
+grep -v "^local_user_map" $GFARM_CONF > $GFARM_CONF.tmp &&
+echo local_user_map $USERMAP_FILE >> $GFARM_CONF.tmp &&
+mv $GFARM_CONF.tmp $GFARM_CONF &&
+echo $GFARM_CONF: updated ||
+ABORT "$GFARM_CONF: cannot append local_user_map statements"
+
 # gfhost
 if [ -z "${GLOBUS_LOCATION-}" ] && [ -n "$globus_location" ] &&
    [ -f "$globus_location/etc/globus-user-env.sh" ]
@@ -321,10 +333,6 @@
 	export GFARM_CONFIG_FILE
 fi
 
-
-if $PRIVATE_MODE; then
-# only private mode
-
 if $FORCE; then
 	"$prefix/bin/gfhost" -d $GFSD_HOSTNAME > /dev/null 2>&1
 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.