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 /contrib/fuse-lib | |
| 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 'contrib/fuse-lib')
| -rw-r--r-- | contrib/fuse-lib/mount.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c index a7fd94de464..1edde86014a 100644 --- a/contrib/fuse-lib/mount.c +++ b/contrib/fuse-lib/mount.c @@ -246,14 +246,16 @@ fuse_mount_sys (const char *mountpoint, char *fsname, #ifdef __FreeBSD__ struct iovec *iov = NULL; int iovlen = 0; + char fdstr[15]; + sprintf (fdstr, "%d", fd); + build_iovec (&iov, &iovlen, "fstype", "fusefs", -1); build_iovec (&iov, &iovlen, "subtype", "glusterfs", -1); - build_iovec (&iov, &iovlen, "fspath", mountpoint, -1); + build_iovec (&iov, &iovlen, "fspath", __DECONST(void *, mountpoint), + -1); build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1); build_iovec (&iov, &iovlen, "volname", source, -1); - build_iovec_argf (&iov, &iovlen, "fd", "%d", fd); - build_iovec_argf (&iov, &iovlen, "user_id", "%d", getuid()); - build_iovec_argf (&iov, &iovlen, "group_id", "%d", getgid()); + build_iovec (&iov, &iovlen, "fd", fdstr, -1); ret = nmount (iov, iovlen, mountflags); #else ret = mount (source, mountpoint, fstype, mountflags, |