summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Rettberg2020-07-30 12:00:11 +0200
committerSimon Rettberg2020-07-30 12:00:11 +0200
commit34c3ff1cd455a0e9e75148a9fc1d96f8b28e3221 (patch)
tree8fce612653c5ce1655582051184b9599c85b4dda /src
parent[SERVER] Remove dead code (diff)
downloaddnbd3-34c3ff1cd455a0e9e75148a9fc1d96f8b28e3221.tar.gz
dnbd3-34c3ff1cd455a0e9e75148a9fc1d96f8b28e3221.tar.xz
dnbd3-34c3ff1cd455a0e9e75148a9fc1d96f8b28e3221.zip
[SERVER] FUSE: Fix arguments to fuse
Diffstat (limited to 'src')
-rw-r--r--src/server/fuse.c3
-rw-r--r--src/server/server.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/fuse.c b/src/server/fuse.c
index 18c0cdf..48e3e5e 100644
--- a/src/server/fuse.c
+++ b/src/server/fuse.c
@@ -543,11 +543,12 @@ bool dfuse_init(const char *opts, const char *dir)
mutex_init( &dirLock, LOCK_FUSE_DIR );
clock_gettime( CLOCK_REALTIME, &startupTime );
struct fuse_args args = FUSE_ARGS_INIT( 0, NULL );
+ fuse_opt_add_arg( &args, "dnbd3fs" ); // argv[0]
if ( opts != NULL ) {
fuse_opt_add_arg( &args, opts );
}
fuse_opt_add_arg( &args, "-odefault_permissions" );
- fuse_opt_add_arg( &args, dir );
+ fuse_opt_add_arg( &args, dir ); // last param is mount point
//
if ( fuse_parse_cmdline( &args, &fuseMountPoint, NULL, NULL ) == -1 ) {
logadd( LOG_ERROR, "FUSE: Error parsing command line" );
diff --git a/src/server/server.c b/src/server/server.c
index 8511167..9dd9f81 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -357,7 +357,7 @@ int main(int argc, char *argv[])
net_init();
uplink_globalsInit();
rpc_init();
- if ( mountDir != NULL && !dfuse_init( NULL, mountDir ) ) {
+ if ( mountDir != NULL && !dfuse_init( "-oallow_other", mountDir ) ) {
logadd( LOG_ERROR, "Cannot mount fuse directory to %s", mountDir );
dnbd3_cleanup();
return EXIT_FAILURE;