octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-19 10:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #454 from ggtakec/master

Browse Source 
Changed for accepting mount options compatible with mtab - #449
This commit is contained in:
Takeshi Nakatani 2016-07-24 17:31:45 +09:00 committed by GitHub
commit ccefd835d0
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/man/s3fs.1
View File

@ -5,6 +5,8 @@ S3FS \- FUSE-based file system backed by Amazon S3
.SS mounting .SS mounting
.TP .TP
\fBs3fs bucket[:/path] mountpoint \fP [options] \fBs3fs bucket[:/path] mountpoint \fP [options]
.TP
\fBs3fs mountpoint \fP [options(must specify bucket= option)]
.SS unmounting .SS unmounting
.TP .TP
\fBumount mountpoint \fBumount mountpoint
@ -48,6 +50,9 @@ FUSE singlethreaded option (disables multi-threaded operation)
All s3fs options must given in the form where "opt" is: All s3fs options must given in the form where "opt" is:
<option_name>=<option_value> <option_name>=<option_value>
.TP .TP
\fB\-o\fR bucket
if it is not specified bucket name(and path) in command line, must specify this option after \-o option for bucket name.
.TP
\fB\-o\fR default_acl (default="private") \fB\-o\fR default_acl (default="private")
the default canned acl to apply to all written S3 objects, e.g., "public-read". the default canned acl to apply to all written S3 objects, e.g., "public-read".
Any created files will have this canned acl. Any created files will have this canned acl.

1
src/s3fs.cpp
View File

@ -178,6 +178,7 @@ static int check_passwd_file_perms(void);
static int read_passwd_file(void); static int read_passwd_file(void);
static int get_access_keys(void); static int get_access_keys(void);
static int set_moutpoint_attribute(struct stat& mpst); static int set_moutpoint_attribute(struct stat& mpst);
static int set_bucket(const char* arg);
static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_args* outargs); static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_args* outargs);
// fuse interface functions // fuse interface functions

15
src/s3fs_util.cpp
View File

@ -905,6 +905,17 @@ void show_help (void)
"\n" "\n"
"Mount an Amazon S3 bucket as a file system.\n" "Mount an Amazon S3 bucket as a file system.\n"
"\n" "\n"
"Usage:\n"
" mounting\n"
" s3fs bucket[:/path] mountpoint [options]\n"
" s3fs mountpoint [options(must specify bucket= option)]\n"
"\n"
" umounting\n"
" umount mountpoint\n"
"\n"
" utility mode (remove interrupted multipart uploading objects)\n"
" s3fs -u bucket\n"
"\n"
" General forms for s3fs and FUSE/mount options:\n" " General forms for s3fs and FUSE/mount options:\n"
" -o opt[,opt...]\n" " -o opt[,opt...]\n"
" -o opt [-o opt] ...\n" " -o opt [-o opt] ...\n"
@ -915,6 +926,10 @@ void show_help (void)
"\n" "\n"
" <option_name>=<option_value>\n" " <option_name>=<option_value>\n"
"\n" "\n"
" bucket\n"
" - if it is not specified bucket name(and path) in command line,\n"
" must specify this option after -o option for bucket name.\n"
"\n"
" default_acl (default=\"private\")\n" " default_acl (default=\"private\")\n"
" - the default canned acl to apply to all written s3 objects\n" " - the default canned acl to apply to all written s3 objects\n"
" see http://aws.amazon.com/documentation/s3/ for the \n" " see http://aws.amazon.com/documentation/s3/ for the \n"