From bd9af62c072f0b15d5f39a0aaa7e5ea7467a4989 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 30 Jun 2023 22:06:45 +0200 Subject: [PATCH] mount: make up volname if not given (macOS), fixes #7690 macFUSE supports a volname mount option to give what finder displays on desktop / in directory list. if the user did not specify it, we make something up, because otherwise it would be "macFUSE Volume 0 (Python)". --- src/borg/fuse.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/borg/fuse.py b/src/borg/fuse.py index c03f31ee1..e5b5e5bfb 100644 --- a/src/borg/fuse.py +++ b/src/borg/fuse.py @@ -44,6 +44,7 @@ def async_wrapper(fn): from .helpers.lrucache import LRUCache from .item import Item from .platform import uid2user, gid2group +from .platformflags import is_darwin from .remote import RemoteRepository @@ -513,6 +514,13 @@ def pop_option(options, key, present, not_present, wanted_type, int_base=0): options = ["fsname=borgfs", "ro", "default_permissions"] if mount_options: options.extend(mount_options.split(",")) + if is_darwin: + # macFUSE supports a volname mount option to give what finder displays on desktop / in directory list. + volname = pop_option(options, "volname", "", "", str) + # if the user did not specify it, we make something up, + # because otherwise it would be "macFUSE Volume 0 (Python)", #7690. + volname = volname or f"{os.path.basename(mountpoint)} (borgfs)" + options.append(f"volname={volname}") ignore_permissions = pop_option(options, "ignore_permissions", True, False, bool) if ignore_permissions: # in case users have a use-case that requires NOT giving "default_permissions",