summaryrefslogtreecommitdiffstats
path: root/extras/geo-rep
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-08-08 05:39:38 +0200
committerHarshavardhana <harsha@harshavardhana.net>2014-08-20 13:46:44 -0700
commit33be39b42f3b9b0505f83a509ff87d416e106158 (patch)
tree94facdd61792f0677898927cd0bcbfe30f0c8084 /extras/geo-rep
parenta521fc1d22db5477552c0fabc1f918b43caa50c3 (diff)
Regression test portability: mktemp
Linux mktemp accepts to run without a template, NetBSD mandates it. Since the template option has the same syntax, add it everywhere. While there, also do this in scripts outside of regression testing. BUG: 764655 Change-Id: I3ec140afbc9009257c81a56d77afcc21fef74cc4 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8432 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Harshavardhana <harsha@harshavardhana.net>
Diffstat (limited to 'extras/geo-rep')
-rw-r--r--extras/geo-rep/generate-gfid-file.sh2
-rw-r--r--extras/geo-rep/gsync-upgrade.sh2
-rw-r--r--extras/geo-rep/slave-upgrade.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/extras/geo-rep/generate-gfid-file.sh b/extras/geo-rep/generate-gfid-file.sh
index c6739fbf140..0b7f60f48e5 100644
--- a/extras/geo-rep/generate-gfid-file.sh
+++ b/extras/geo-rep/generate-gfid-file.sh
@@ -18,7 +18,7 @@ function mount_client()
GFID_CMD=$3;
OUTPUT=$4;
- T=$(mktemp -d);
+ T=$(mktemp -d -t ${0##*/}.XXXXXX);
glusterfs -s $VOLFILE_SERVER --volfile-id $VOLUME $T;
diff --git a/extras/geo-rep/gsync-upgrade.sh b/extras/geo-rep/gsync-upgrade.sh
index b179487365a..0f73a33884b 100644
--- a/extras/geo-rep/gsync-upgrade.sh
+++ b/extras/geo-rep/gsync-upgrade.sh
@@ -75,7 +75,7 @@ function mount_client()
GFID_FILE=$3
SYNC_CMD=$4
- T=$(mktemp -d);
+ T=$(mktemp -d -t ${0##*/}.XXXXXX);
glusterfs --aux-gfid-mount -s $1 --volfile-id $2 $T;
diff --git a/extras/geo-rep/slave-upgrade.sh b/extras/geo-rep/slave-upgrade.sh
index 6198f408af7..3a37f8e3579 100644
--- a/extras/geo-rep/slave-upgrade.sh
+++ b/extras/geo-rep/slave-upgrade.sh
@@ -55,7 +55,7 @@ function mount_client()
GFID_FILE=$3
SYNC_CMD=$4
- T=$(mktemp -d);
+ T=$(mktemp -d -t ${0##*/}.XXXXXX);
glusterfs --aux-gfid-mount -s $1 --volfile-id $VOLUME_NAME $T;