summaryrefslogtreecommitdiffstats
path: root/xlators/mount/fuse/utils/mount.glusterfs.in
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-05-16 16:58:20 +0200
committerAnand Avati <avati@redhat.com>2014-05-17 11:53:34 -0700
commit618d465295df02ae6d53be1327947a210bb8b47d (patch)
tree5d6a8a489ab3fc339d478cd16c7401736f749df8 /xlators/mount/fuse/utils/mount.glusterfs.in
parentaa85de4be3f96a140a69170330293bfdfa3d24e7 (diff)
NetBSD build fixes
- Shell scripts: == is specific to bash and ksh. Use = instead. - Shell scripts: use sh instead of bash if bash functionnality is not used - Shell scripts: ${var/search/replace} is specific to bash - sed: The -i option is specific to GNU sed. - Makefiles: $< outside of generic rules only work in GNU make. - xdrproc_t() is not universally defined as variadic. Do not specify third argument if it is not used - NetBSD FUSE specific: only include <perfuse.h> in FUSE client code, it harms in other locations - configure: Search for gettext() in libintl as NetBSD stores it there - Like MacOS X, NetBSD has unmount(2) and not umount(2) (un vs u) Some other build issues previously included in this change were removed: - __THROW macro, addressed in http://review.gluster.com/#/c/7757/ - getmntent() compat shared with MacOS X, in http://review.gluster.com/#/c/7722/ This patchset adds warning fixes for mount_glusterfs BUG: 764655 Change-Id: I2f1faf8ff96362d3e2baf237b943df619011f1f4 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/7783 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Diffstat (limited to 'xlators/mount/fuse/utils/mount.glusterfs.in')
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in44
1 files changed, 25 insertions, 19 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 71ea66c3ca8..154b8fa97e8 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
# This file is part of GlusterFS.
@@ -37,7 +37,6 @@ _init ()
warn "WARNING: getfattr not found, certain checks will be skipped.."
fi
- alias lsL='ls -L'
mounttab=/proc/mounts
uname_s=`uname -s`
case ${uname_s} in
@@ -330,7 +329,7 @@ check_recursive_mount ()
# remove trailing / from mount point
mnt_dir=${1%/};
- if [ -n ${getfattr} ]; then
+ if [ -n "${getfattr}" ]; then
${getfattr} -n trusted.gfid $mnt_dir 2>/dev/null | grep -iq "trusted.gfid=";
if [ $? -eq 0 ]; then
warn "ERROR: $mnt_dir is in use as a brick of a gluster volume";
@@ -341,7 +340,7 @@ check_recursive_mount ()
# check if the mount point is a brick's parent directory
GLUSTERD_WORKDIR="/var/lib/glusterd";
- lsL "$GLUSTERD_WORKDIR"/vols/*/bricks/* > /dev/null 2>&1;
+ ls -L "$GLUSTERD_WORKDIR"/vols/*/bricks/* > /dev/null 2>&1;
if [ $? -ne 0 ]; then
return;
fi
@@ -358,7 +357,7 @@ check_recursive_mount ()
continue;
fi
- if [ -n ${getfattr} ]; then
+ if [ -n "${getfattr}" ]; then
${getfattr} -n trusted.gfid "$brick" 2>/dev/null | grep -iq "trusted.gfid=";
if [ $? -eq 0 ]; then
# brick is local
@@ -452,17 +451,17 @@ with_options()
use_readdirp=$value
;;
"no-root-squash")
- if [ $value == "yes" ] ||
- [ $value == "on" ] ||
- [ $value == "enable" ] ||
- [ $value == "true" ] ; then
+ if [ $value = "yes" ] ||
+ [ $value = "on" ] ||
+ [ $value = "enable" ] ||
+ [ $value = "true" ] ; then
no_root_squash=1;
fi ;;
"root-squash")
- if [ $value == "no" ] ||
- [ $value == "off" ] ||
- [ $value == "disable" ] ||
- [ $value == "false" ] ; then
+ if [ $value = "no" ] ||
+ [ $value = "off" ] ||
+ [ $value = "disable" ] ||
+ [ $value = "false" ] ; then
no_root_squash=1;
fi ;;
*)
@@ -521,7 +520,7 @@ without_options()
parse_options()
{
local optarg=${1}
- for pair in $(echo ${optarg//,/ }); do
+ for pair in $(echo ${optarg}|sed 's/,/ /g'); do
key=$(echo "$pair" | cut -f1 -d'=');
value=$(echo "$pair" | cut -f2- -d'=');
if [ "$key" = "$value" ]; then
@@ -549,16 +548,18 @@ update_updatedb()
main ()
{
+ if [ "x${uname_s}" = "xLinux" ] ; then
+ volfile_loc=$1
+ mount_point=$2
- volfile_loc=$1
- mount_point=$2
-
- ## `mount` specifies options as a last argument
- shift 2;
+ ## `mount` specifies options as a last argument
+ shift 2;
+ fi
while getopts "Vo:h" opt; do
case "${opt}" in
o)
parse_options ${OPTARG};
+ shift 2;
;;
V)
${cmd_line} -V;
@@ -575,6 +576,11 @@ main ()
esac
done
+ if [ "x${uname_s}" = "xNetBSD" ] ; then
+ volfile_loc=$1
+ mount_point=$2
+ fi
+
[ -r "$volfile_loc" ] || {
server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:.\-]*\):.*/\1/p');
volume_str=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p');