X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Fclient%2Ffuse%2Fmain.c;h=114e921d7789e35c46155ece5e0f69c29d78133d;hb=HEAD;hp=705b6a828d7954137a6fecb7b5aea238daca821f;hpb=d4d69bcdca8f712179d0b49a267840a696514944;p=captive.git diff --git a/src/client/fuse/main.c b/src/client/fuse/main.c index 705b6a8..114e921 100644 --- a/src/client/fuse/main.c +++ b/src/client/fuse/main.c @@ -57,7 +57,7 @@ /* FIXME: Dupe with libcaptive/client/options.c */ #define DEFAULT_SYSLOG_FACILITY LOG_DAEMON /* Each element must be preceded by a comma (',')! */ -#define LIBFUSE_ADDONS ",default_permissions,kernel_cache" +#define LIBFUSE_ADDONS ",default_permissions,allow_other,kernel_cache" CaptiveVfsObject *capfuse_captive_vfs_object; @@ -146,11 +146,9 @@ char **sp; } #endif - g_log_set_always_fatal(~(0 - |G_LOG_LEVEL_MESSAGE - |G_LOG_LEVEL_INFO - |G_LOG_LEVEL_DEBUG - )); + /* Do not set g_log_set_always_fatal() here as we would not be able + * to restart failed children due to communication-failure alarms. + */ captive_standalone_init(); @@ -225,7 +223,8 @@ char *s,quote; if (0 || !strcmp(*csp,"defaults") || !strcmp(*csp, "auto") - || !strcmp(*csp,"noauto")) { + || !strcmp(*csp,"noauto") + || !strcmp(*csp,"user")) { memmove(csp,csp+1,(opt_o_argv+opt_o_argc+1-(csp+1))*sizeof(*csp)); opt_o_argc--; csp--; @@ -316,7 +315,7 @@ const char *fsname; else fsname=program_name; if (strncmp(fsname,self_prefix,self_prefix_len)) - g_error(_("Cannot detected default filesystem name from my basename: %s"),fsname); + g_error(_("Cannot detect default filesystem name from my basename: %s"),fsname); fsname+=self_prefix_len; if (!captive_options_module_load(&options.filesystem, captive_printf_alloca("%s/%s.sys",G_STRINGIFY(VARLIBCAPTIVEDIR),fsname)))