rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add tagging branches RW/RO/NW

Browse source 
This allows users to tag a branch as readonly or not for writing regardless
of how the filesystem is mounted. Should simplify deployments and offer
more flexibility.
This commit is contained in:
Antonio SJ Musumeci 2018-10-20 23:40:02 -04:00
parent 8dd0dc11ee
commit b55ebba4ed
57 changed files with 1586 additions and 1210 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/option_parser.cpp
View file

@ -73,14 +73,18 @@ set_kv_option(fuse_args &args,
static
void
set_fsname(fuse_args &args,
const vector<string> &srcmounts)
set_fsname(fuse_args &args,
const Branches &branches_)
{
if(srcmounts.size() > 0)
vector<string> branches;
branches_.to_paths(branches);
if(branches.size() > 0)
{
std::string fsname;
fsname = str::remove_common_prefix_and_join(srcmounts,':');
fsname = str::remove_common_prefix_and_join(branches,':');
set_kv_option(args,"fsname",fsname);
}
@ -257,16 +261,10 @@ process_opt(Config &config,
static
int
process_srcmounts(const char *arg,
Config &config)
process_branches(const char *arg,
Config &config)
{
vector<string> paths;
str::split(paths,arg,':');
fs::glob(paths,config.srcmounts);
fs::realpathize(config.srcmounts);
config.branches.set(arg);
return 0;
}
@ -356,8 +354,8 @@ option_processor(void *data,
break;
case FUSE_OPT_KEY_NONOPT:
rv = config.srcmounts.empty() ?
process_srcmounts(arg,config) :
rv = config.branches.empty() ?
process_branches(arg,config) :
process_destmounts(arg,config);
break;
@ -406,7 +404,7 @@ namespace mergerfs
opts,
::option_processor);
set_fsname(args,config.srcmounts);
set_fsname(args,config.branches);
set_subtype(args);
}
}