diff options
| -rw-r--r-- | ChangeLog.rst | 7 | ||||
| -rw-r--r-- | util/fusermount.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst index ecca75d..47b993a 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,3 +1,10 @@ +Unreleased Changes +================== + +* Allow "nonempty" as a mount option, for backwards compatibility with + fusermount 2. The option has no effect since mounting over non-empty + directories is allowed by default. + libfuse 3.10.1 (2020-12-07) =========================== diff --git a/util/fusermount.c b/util/fusermount.c index 243d25e..ed62ea9 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -773,7 +773,8 @@ static int do_mount(const char *mnt, const char **typep, mode_t rootmode, blkdev = 1; } else if (opt_eq(s, len, "auto_unmount")) { auto_unmount = 1; - } else if (!begins_with(s, "fd=") && + } else if (!opt_eq(s, len, "nonempty") && + !begins_with(s, "fd=") && !begins_with(s, "rootmode=") && !begins_with(s, "user_id=") && !begins_with(s, "group_id=")) { |