Renamed fusermount / mount.fuse to fusermount3 / mount.fuse3

6 files changed, 25 insertions, 19 deletions

diff --git a/ChangeLog.rst b/ChangeLog.rst
index a849be4..e3529b3 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,3 +1,10 @@
+Unreleased Changes
+==================
+
+* The fusermount and mount.fuse binaries have been renamed to
+  fusermount3 and mount.fuse3 to allow co-installation of libfuse 2.x
+  and 3.x
+
 FUSE 3.0.0-rc1 (2016-10-28)
 ===========================
 
diff --git a/Makefile.am b/Makefile.am
index 25d88d0..33b8e0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,10 @@ $(pkgconfig_DATA): config.status
 setuid_fusermount:
 	@echo "Attempting to use sudo to make util/fusermount setuid root"
 	@echo "If this fails, set permissions manually and re-run make test"
-	test $$(ls -n util/fusermount | awk 'NR==1 {print $$3}') -eq 0 || \
-	    sudo chown root util/fusermount
-	test -u util/fusermount || \
-	    sudo chmod u+s util/fusermount
+	test $$(ls -n util/fusermount3 | awk 'NR==1 {print $$3}') -eq 0 || \
+	    sudo chown root util/fusermount3
+	test -u util/fusermount3 || \
+	    sudo chmod u+s util/fusermount3
 
 # If we are not root, util/fusermount needs to be setuid root
 # for tests to work.
diff --git a/lib/mount.c b/lib/mount.c
index bb13c30..5bd2858 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -40,7 +40,7 @@
 #define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0)
 #endif
 
-#define FUSERMOUNT_PROG		"fusermount"
+#define FUSERMOUNT_PROG		"fusermount3"
 #define FUSE_COMMFD_ENV		"_FUSE_COMMFD"
 
 #ifndef HAVE_FORK
diff --git a/test/util.py b/test/util.py
index baba20b..4f8e123 100644
--- a/test/util.py
+++ b/test/util.py
@@ -22,7 +22,7 @@ def wait_for_mount(mount_process, mnt_dir,
 def cleanup(mnt_dir):
     # Don't bother trying Valgrind if things already went wrong
 
-    subprocess.call([pjoin(basename, 'util', 'fusermount'),
+    subprocess.call([pjoin(basename, 'util', 'fusermount3'),
                      '-z', '-u', mnt_dir],
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.STDOUT)
@@ -35,7 +35,7 @@ def umount(mount_process, mnt_dir):
     else:
         cmdline = []
 
-    cmdline = cmdline + [ pjoin(basename, 'util', 'fusermount'),
+    cmdline = cmdline + [ pjoin(basename, 'util', 'fusermount3'),
                           '-z', '-u', mnt_dir ]
     subprocess.check_call(cmdline)
     assert not os.path.ismount(mnt_dir)
diff --git a/util/.gitignore b/util/.gitignore
index 961b59b..bfa05af 100644
--- a/util/.gitignore
+++ b/util/.gitignore
@@ -1,4 +1,3 @@
-fusermount
-fuse_ioslave
-mount.fuse
-mount_util.c
+fusermount3
+mount.fuse3
+mount_util.c
\ No newline at end of file
diff --git a/util/Makefile.am b/util/Makefile.am
index a489d28..32c4e1e 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,22 +1,22 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = fusermount
-noinst_PROGRAMS = mount.fuse
+bin_PROGRAMS = fusermount3
+noinst_PROGRAMS = mount.fuse3
 
 # we re-use mount_util.c from the library, but do want to keep ourself
 # as stand-alone as possible. in order to make an out-of-source build
 # possible, we "generate" the file from its original location by
 # copying it over.
-fusermount_SOURCES = fusermount.c mount_util.c
-fusermount_CPPFLAGS = -I$(top_srcdir)/lib
+fusermount3_SOURCES = fusermount.c mount_util.c
+fusermount3_CPPFLAGS = -I$(top_srcdir)/lib
 BUILT_SOURCES = mount_util.c
 mount_util.c: $(top_srcdir)/lib/mount_util.c
 	@cp $(top_srcdir)/lib/mount_util.c .
 
-mount_fuse_SOURCES = mount.fuse.c
+mount_fuse3_SOURCES = mount.fuse.c
 
 install-exec-hook:
-	-chmod u+s $(DESTDIR)$(bindir)/fusermount
+	-chmod u+s $(DESTDIR)$(bindir)/fusermount3
 	@if test ! -e $(DESTDIR)/dev/fuse; then \
 		$(MKDIR_P) $(DESTDIR)/dev; \
 		echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
@@ -31,7 +31,7 @@ INIT_D_PATH = @INIT_D_PATH@
 
 install-exec-local:
 	$(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
-	$(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+	$(INSTALL_PROGRAM) $(builddir)/mount.fuse3 $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse3
 	$(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
 	$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
 	@if test -x /usr/sbin/update-rc.d; then \
@@ -44,7 +44,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
 
 uninstall-local:
-	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse3
 	rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
 	rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
 	@if test -x /usr/sbin/update-rc.d; then \