Unexport osxfuse-related code.
commit
d66bad8705
|
@ -135,14 +135,6 @@ type MountConfig struct {
|
||||||
// default name involving the string 'osxfuse' is used.
|
// default name involving the string 'osxfuse' is used.
|
||||||
VolumeName string
|
VolumeName string
|
||||||
|
|
||||||
// OS X only.
|
|
||||||
//
|
|
||||||
// OSXFUSELocations sets where to look for OSXFUSE files. The arguments are
|
|
||||||
// all the possible locations. The previous locations are replaced.
|
|
||||||
//
|
|
||||||
// Without this option, OSXFUSELocationV3 and OSXFUSELocationV2 are used.
|
|
||||||
OSXFUSELocations []OSXFUSEPaths
|
|
||||||
|
|
||||||
// Additional key=value options to pass unadulterated to the underlying mount
|
// Additional key=value options to pass unadulterated to the underlying mount
|
||||||
// command. See `man 8 mount`, the fuse documentation, etc. for
|
// command. See `man 8 mount`, the fuse documentation, etc. for
|
||||||
// system-specific information.
|
// system-specific information.
|
||||||
|
@ -238,38 +230,3 @@ func (c *MountConfig) toOptionsString() string {
|
||||||
|
|
||||||
return strings.Join(components, ",")
|
return strings.Join(components, ",")
|
||||||
}
|
}
|
||||||
|
|
||||||
// OSXFUSEPaths describes the paths used by an installed OSXFUSE version.
|
|
||||||
// See OSXFUSELocationV3 for typical values.
|
|
||||||
type OSXFUSEPaths struct {
|
|
||||||
// Prefix for the device file. At mount time, an incrementing number is
|
|
||||||
// suffixed until a free FUSE device is found.
|
|
||||||
DevicePrefix string
|
|
||||||
|
|
||||||
// Path of the load helper, used to load the kernel extension if no device
|
|
||||||
// files are found.
|
|
||||||
Load string
|
|
||||||
|
|
||||||
// Path of the mount helper, used for the actual mount operation.
|
|
||||||
Mount string
|
|
||||||
|
|
||||||
// Environment variable used to pass the path to the executable calling the
|
|
||||||
// mount helper.
|
|
||||||
DaemonVar string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default paths for OSXFUSE. See OSXFUSELocations.
|
|
||||||
var (
|
|
||||||
OSXFUSELocationV3 = OSXFUSEPaths{
|
|
||||||
DevicePrefix: "/dev/osxfuse",
|
|
||||||
Load: "/Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse",
|
|
||||||
Mount: "/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse",
|
|
||||||
DaemonVar: "MOUNT_OSXFUSE_DAEMON_PATH",
|
|
||||||
}
|
|
||||||
OSXFUSELocationV2 = OSXFUSEPaths{
|
|
||||||
DevicePrefix: "/dev/osxfuse",
|
|
||||||
Load: "/Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs",
|
|
||||||
Mount: "/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs",
|
|
||||||
DaemonVar: "MOUNT_FUSEFS_DAEMON_PATH",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
|
@ -17,11 +17,48 @@ var errNoAvail = errors.New("no available fuse devices")
|
||||||
var errNotLoaded = errors.New("osxfuse is not loaded")
|
var errNotLoaded = errors.New("osxfuse is not loaded")
|
||||||
|
|
||||||
// errOSXFUSENotFound is returned from Mount when the OSXFUSE installation is
|
// errOSXFUSENotFound is returned from Mount when the OSXFUSE installation is
|
||||||
// not detected.
|
// not detected. Make sure OSXFUSE is installed.
|
||||||
//
|
|
||||||
// Make sure OSXFUSE is installed, or see OSXFUSELocations for customization.
|
|
||||||
var errOSXFUSENotFound = errors.New("cannot locate OSXFUSE")
|
var errOSXFUSENotFound = errors.New("cannot locate OSXFUSE")
|
||||||
|
|
||||||
|
// osxfuseInstallation describes the paths used by an installed OSXFUSE
|
||||||
|
// version.
|
||||||
|
type osxfuseInstallation struct {
|
||||||
|
// Prefix for the device file. At mount time, an incrementing number is
|
||||||
|
// suffixed until a free FUSE device is found.
|
||||||
|
DevicePrefix string
|
||||||
|
|
||||||
|
// Path of the load helper, used to load the kernel extension if no device
|
||||||
|
// files are found.
|
||||||
|
Load string
|
||||||
|
|
||||||
|
// Path of the mount helper, used for the actual mount operation.
|
||||||
|
Mount string
|
||||||
|
|
||||||
|
// Environment variable used to pass the path to the executable calling the
|
||||||
|
// mount helper.
|
||||||
|
DaemonVar string
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
osxfuseInstallations = []osxfuseInstallation{
|
||||||
|
// v3
|
||||||
|
{
|
||||||
|
DevicePrefix: "/dev/osxfuse",
|
||||||
|
Load: "/Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse",
|
||||||
|
Mount: "/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse",
|
||||||
|
DaemonVar: "MOUNT_OSXFUSE_DAEMON_PATH",
|
||||||
|
},
|
||||||
|
|
||||||
|
// v2
|
||||||
|
{
|
||||||
|
DevicePrefix: "/dev/osxfuse",
|
||||||
|
Load: "/Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs",
|
||||||
|
Mount: "/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs",
|
||||||
|
DaemonVar: "MOUNT_FUSEFS_DAEMON_PATH",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
func loadOSXFUSE(bin string) error {
|
func loadOSXFUSE(bin string) error {
|
||||||
cmd := exec.Command(bin)
|
cmd := exec.Command(bin)
|
||||||
cmd.Dir = "/"
|
cmd.Dir = "/"
|
||||||
|
@ -136,16 +173,8 @@ func mount(
|
||||||
dir string,
|
dir string,
|
||||||
cfg *MountConfig,
|
cfg *MountConfig,
|
||||||
ready chan<- error) (dev *os.File, err error) {
|
ready chan<- error) (dev *os.File, err error) {
|
||||||
// get OSXFUSE locations
|
// Find the version of osxfuse installed on this machine.
|
||||||
locations := cfg.OSXFUSELocations
|
for _, loc := range osxfuseInstallations {
|
||||||
if locations == nil {
|
|
||||||
locations = []OSXFUSEPaths{
|
|
||||||
OSXFUSELocationV3,
|
|
||||||
OSXFUSELocationV2,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, loc := range locations {
|
|
||||||
if _, err := os.Stat(loc.Mount); os.IsNotExist(err) {
|
if _, err := os.Stat(loc.Mount); os.IsNotExist(err) {
|
||||||
// try the other locations
|
// try the other locations
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in New Issue