Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/mnt/fuse_pure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ fn fuse_mount_fusermount(
let fusermount_bin = detect_fusermount_bin();

if fusermount_bin.ends_with(MOUNT_FUSEFS_BIN) {
return fuse_mount_mount_fusefs(&fusermount_bin, mountpoint, options);
return fuse_mount_mount_fusefs(&fusermount_bin, mountpoint, options, acl);
}

let (child_socket, receive_socket) = UnixStream::pair()?;
Expand Down Expand Up @@ -349,16 +349,18 @@ fn fuse_mount_mount_fusefs(
fusermount_bin: &str,
mountpoint: &OsStr,
options: &[MountOption],
acl: SessionACL,
) -> Result<(DevFuse, Option<UnixStream>), Error> {
let fuse_device = DevFuse::open()?;

let fuse_fd = fuse_device.as_raw_fd();

let mut builder = Command::new(fusermount_bin);
builder.stdout(Stdio::piped()).stderr(Stdio::piped());
if !options.is_empty() {
let mut options_strs: Vec<String> = options.iter().map(option_to_string).collect();
options_strs.extend(acl.to_mount_option().map(|s| s.to_owned()));
if !options_strs.is_empty() {
builder.arg("-o");
let options_strs: Vec<String> = options.iter().map(option_to_string).collect();
builder.arg(options_strs.join(","));
}

Expand Down
Loading