diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-14 13:06:26 -0700 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-09-03 11:01:45 -0700 |
| commit | 025ae07850375cbf981ed335a4ddf702d54be6e3 (patch) | |
| tree | a119246764dc98f0d0c7fb87572cd1b01bc18684 /cli/src/cli-cmd-volume.c | |
| parent | 845d6c76701a3de6a11b76b004176971411c714e (diff) | |
build: make GLUSTERD_WORKDIR rely on localstatedir
Backport from master branch - http://review.gluster.org/#/c/8246/
- Break-way from '/var/lib/glusterd' hard-coded previously,
instead rely on 'configure' value from 'localstatedir'
- Provide 's/lib/db' as default working directory for gluster
management daemon for BSD and Darwin based installations
- loff_t is really off_t on Darwin
- fix-off the warnings generated by clang on FreeBSD/Darwin
- Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all
platforms.
- Define proper environment for running tests, define correct PATH
and LD_LIBRARY_PATH when running tests, so that the desired version
of glusterfs is used, regardless where it is installed.
(Thanks to manu@netbsd.org for this additional work)
Change-Id: I06e684ac4c26d1e74c9daf76753403ad15f79276
BUG: 1130308
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8486
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'cli/src/cli-cmd-volume.c')
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 43e696d56c5..c743b8bc9f0 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1222,7 +1222,8 @@ _limits_set_on_volume (char *volname) { /* TODO: fix hardcoding; Need to perform an RPC call to glusterd * to fetch working directory */ - sprintf (quota_conf_file, "/var/lib/glusterd/vols/%s/quota.conf", + sprintf (quota_conf_file, "%s/vols/%s/quota.conf", + GLUSTERD_DEFAULT_WORKDIR, volname); fd = open (quota_conf_file, O_RDONLY); if (fd == -1) @@ -1350,7 +1351,8 @@ cli_cmd_quota_handle_list_all (const char **words, dict_t *options) //TODO: fix hardcoding; Need to perform an RPC call to glusterd //to fetch working directory - sprintf (quota_conf_file, "/var/lib/glusterd/vols/%s/quota.conf", + sprintf (quota_conf_file, "%s/vols/%s/quota.conf", + GLUSTERD_DEFAULT_WORKDIR, volname); fd = open (quota_conf_file, O_RDONLY); if (fd == -1) { |