diff options
author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-05-16 16:58:20 +0200 |
---|---|---|
committer | Anand Avati <avati@redhat.com> | 2014-05-17 11:53:34 -0700 |
commit | 618d465295df02ae6d53be1327947a210bb8b47d (patch) | |
tree | 5d6a8a489ab3fc339d478cd16c7401736f749df8 /extras | |
parent | aa85de4be3f96a140a69170330293bfdfa3d24e7 (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 'extras')
-rwxr-xr-x | extras/post-upgrade-script-for-quota.sh | 4 | ||||
-rwxr-xr-x | extras/pre-upgrade-script-for-quota.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extras/post-upgrade-script-for-quota.sh b/extras/post-upgrade-script-for-quota.sh index c226687935d..15652429056 100755 --- a/extras/post-upgrade-script-for-quota.sh +++ b/extras/post-upgrade-script-for-quota.sh @@ -15,7 +15,7 @@ BACKUP_DIR=/var/tmp/glusterfs/quota-config-backup function set_limits { local var=$(gluster volume info $1 | grep 'features.quota'| cut -d" " -f2); - if [ -z "$var" ] || [ "$var" == "off" ]; then + if [ -z "$var" ] || [ "$var" = "off" ]; then if [ $2 -eq '0' ]; then echo "Volume $1 does not have quota enabled. " \ "Exiting ..." @@ -54,7 +54,7 @@ if [ -z $1 ]; then exit 1; fi -if [ "$1" == "all" ]; then +if [ "$1" = "all" ]; then for VOL in `gluster volume list`; do set_limits $VOL '1'; diff --git a/extras/pre-upgrade-script-for-quota.sh b/extras/pre-upgrade-script-for-quota.sh index a8001e9e1fe..9ff15f3b307 100755 --- a/extras/pre-upgrade-script-for-quota.sh +++ b/extras/pre-upgrade-script-for-quota.sh @@ -10,7 +10,7 @@ BACKUP_DIR=/var/tmp/glusterfs/quota-config-backup mkdir -p $BACKUP_DIR for i in `gluster volume list`; do var=$(gluster volume info $i | grep 'features.quota'| cut -d" " -f2); - if [ -z "$var" ] || [ "$var" == "off" ]; then + if [ -z "$var" ] || [ "$var" = "off" ]; then continue else gluster volume quota $i list > $BACKUP_DIR/vol_$i; |