summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvra Sengupta <asengupt@redhat.com>2014-05-28 12:23:43 +0000
committerVenky Shankar <vshankar@redhat.com>2014-06-05 00:07:35 -0700
commit4e8d5af64d78533e801cac45ccb28ace7d91cc62 (patch)
tree0abd94eceb8dc736eb0c1a9b4730044ae3d96023
parent7e3b038c6cea6a89feae684012fa6a33443c7473 (diff)
glusterd/geo-rep: Not setting the user name as the user group by default
Also removing multiple mounts in gverify.sh Change-Id: I1567a9f711222c5f571a12f7c4ab49cef32d60c9 BUG: 1101948 Signed-off-by: Avra Sengupta <asengupt@redhat.com> Reviewed-on: http://review.gluster.org/7911 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kotresh HR <khiremat@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Venky Shankar <vshankar@redhat.com>
-rwxr-xr-xgeo-replication/src/gverify.sh3
-rw-r--r--geo-replication/src/peer_add_secret_pub.in4
2 files changed, 3 insertions, 4 deletions
diff --git a/geo-replication/src/gverify.sh b/geo-replication/src/gverify.sh
index 32ba843ceee..89eceb8f3ef 100755
--- a/geo-replication/src/gverify.sh
+++ b/geo-replication/src/gverify.sh
@@ -81,8 +81,7 @@ function slave_stats()
local status;
d=$(mktemp -d 2>/dev/null);
- glusterfs --xlator-option="*dht.lookup-unhashed=off" --volfile-server $SLAVEHOST --volfile-id $SLAVEVOL -l $slave_log_file \$d;
- mount -t glusterfs $SLAVEHOST:$SLAVEVOL $d
+ glusterfs --xlator-option="*dht.lookup-unhashed=off" --volfile-server $SLAVEHOST --volfile-id $SLAVEVOL -l $slave_log_file $d;
i=$(stat -c "%i" $d);
if [[ "$i" -ne "1" ]]; then
echo 0:0;
diff --git a/geo-replication/src/peer_add_secret_pub.in b/geo-replication/src/peer_add_secret_pub.in
index 8bfecce9b09..122e577b446 100644
--- a/geo-replication/src/peer_add_secret_pub.in
+++ b/geo-replication/src/peer_add_secret_pub.in
@@ -21,13 +21,13 @@ fi
if [ ! -d $home_dir/.ssh ]; then
mkdir $home_dir/.ssh;
chmod 700 $home_dir/.ssh;
- chown $user:$user $home_dir/.ssh;
+ chown $user: $home_dir/.ssh;
fi
if [ ! -d $home_dir/.ssh/authorized_keys ]; then
touch $home_dir/.ssh/authorized_keys;
chmod 600 $home_dir/.ssh/authorized_keys;
- chown $user:$user $home_dir/.ssh/authorized_keys;
+ chown $user: $home_dir/.ssh/authorized_keys;
fi
cat "$GLUSTERD_WORKING_DIR"/geo-replication/common_secret.pem.pub >> $home_dir/.ssh/authorized_keys;