Control: tags 939767 + patch Dear maintainer,
I've prepared a patch which restores support for "-o nonempty", thus allowing programs using that option with fuse to continue working as-is with fuse3 (where the default behaviour is equivalent to "-o nonempty"). I can upload an NMU if it's helpful for you. Regards, Stephen
diff -Nru fuse3-3.10.1/debian/changelog fuse3-3.10.1/debian/changelog
--- fuse3-3.10.1/debian/changelog 2021-01-16 10:34:25.000000000 +0100
+++ fuse3-3.10.1/debian/changelog 2021-01-28 09:04:24.000000000 +0100
@@ -1,3 +1,13 @@
+fuse3 (3.10.1-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Ignore "-o nonempty" instead of treating it as an error; the default
+ behaviour in fuse3 is equivalent to "-o nonempty". This allows
+ software expecting fuse2 semantics to work with fusermount3.
+ Closes: #939767.
+
+ -- Stephen Kitt <sk...@debian.org> Thu, 28 Jan 2021 09:04:24 +0100
+
fuse3 (3.10.1-2) unstable; urgency=medium
* Add upstream metadata.
diff -Nru fuse3-3.10.1/debian/patches/restore-nonempty.patch fuse3-3.10.1/debian/patches/restore-nonempty.patch
--- fuse3-3.10.1/debian/patches/restore-nonempty.patch 1970-01-01 01:00:00.000000000 +0100
+++ fuse3-3.10.1/debian/patches/restore-nonempty.patch 2021-01-28 09:04:24.000000000 +0100
@@ -0,0 +1,21 @@
+Description: Restore "-o nonempty"
+Author: Stephen Kitt <sk...@debian.org>
+
+This ignores "nonempty" options, which effectively restores "-o
+nonempty" on fusermount: the default behaviour is now to support
+non-empty mounts, so treating "-o nonempty" as a no-op provides the
+requested behaviour and allows older programs to continue working with
+fuse3 instead of fuse.
+
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -795,7 +795,8 @@
+ 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=")) {
diff -Nru fuse3-3.10.1/debian/patches/series fuse3-3.10.1/debian/patches/series
--- fuse3-3.10.1/debian/patches/series 2021-01-16 10:34:25.000000000 +0100
+++ fuse3-3.10.1/debian/patches/series 2021-01-28 08:59:44.000000000 +0100
@@ -1,2 +1,3 @@
add_exfat_to_whitelist.patch
fix-ftbfs-kfreebsd.patch
+restore-nonempty.patch
signature.asc
Description: PGP signature
