Make weed-fuse compatible with systemd-based mount (#6814)

* Make weed-fuse compatible with systemd-mount series

* fix: add missing type annotation on skipAutofs param in FreeBSD build

The parameter was declared without a type, causing a compile error on FreeBSD.

* fix: guard hasAutofs nil dereference and make FsName conditional on autofs mode

- Check option.hasAutofs for nil before dereferencing to prevent panic
  when RunMount is called without the flag initialized.
- Only set FsName to "fuse" when autofs mode is active; otherwise
  preserve the descriptive server:path name for mount/df output.
- Fix typo: recogize -> recognize.

* fix: consistent error handling for autofs option and log ignored _netdev

- Replace panic with fmt.Fprintf+return false for autofs parse errors,
  matching the pattern used by other fuse option parsers.
- Log when _netdev option is silently stripped to aid debugging.

---------

Co-authored-by: Chris Lu <chris.lu@gmail.com>
This commit is contained in:
Weihao Jiang
2026-03-19 03:18:40 +08:00
committed by GitHub
parent e59bcfebcc
commit 01987bcafd
6 changed files with 39 additions and 7 deletions

View File

@@ -12,6 +12,7 @@ import (
"syscall"
"time"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/util"
util_http "github.com/seaweedfs/seaweedfs/weed/util/http"
)
@@ -267,6 +268,19 @@ func runFuse(cmd *Command, args []string) bool {
fmt.Fprintf(os.Stderr, "failed to parse 'sys.novncache' value %q: %v\n", parameter.value, err)
return false
}
case "autofs":
if parsed, err := strconv.ParseBool(parameter.value); err == nil {
mountOptions.hasAutofs = &parsed
} else {
fmt.Fprintf(os.Stderr, "failed to parse 'autofs' value %q: %v\n", parameter.value, err)
return false
}
case "_netdev":
// _netdev is used for systemd/fstab parser to signify that this is a network mount but systemd
// mount sometimes can't strip them off. Meanwhile, fuse3 would refuse to run with _netdev, we
// strip them here if it fails to be stripped by the caller.
//(See https://github.com/seaweedfs/seaweedfs/wiki/fstab/948a70df5c0d9d2d27561b96de53bde07a29d2db)
glog.V(0).Infof("ignoring _netdev mount option")
default:
t := parameter.name
if parameter.value != "true" {