diff options
| author |  Przemysław Pawełczyk <przemoc@gmail.com> | 2016-11-29 06:33:14 +0100 |
|---|---|---|
| committer |  Nikolaus Rath <Nikolaus@rath.org> | 2016-11-28 21:33:14 -0800 |
| commit | dfbfee07abc9329715a12ce251e0ceeda8d78f19 (patch) | |
| tree | 44015341e5c1fe85631d710768a88352efaad71c /util | |
| parent | 4fdf83f4dd2b0c3a0688d23de23ad953abf473ac (diff) | |
Rename more things from fuse to fuse3
Diffstat (limited to 'util')
| -rw-r--r-- | util/Makefile.am | 4 | ||||
| -rw-r--r-- | util/fusermount.c | 10 | ||||
| -rwxr-xr-x | util/init_script | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/util/Makefile.am b/util/Makefile.am index 32c4e1e..756afea 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -33,7 +33,7 @@ install-exec-local: $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH) $(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 + $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse3 @if test -x /usr/sbin/update-rc.d; then \ echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \ /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \ @@ -41,7 +41,7 @@ install-exec-local: install-data-local: $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_PATH) - $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules + $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse3.rules uninstall-local: rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse3 diff --git a/util/fusermount.c b/util/fusermount.c index 03da451..0f65435 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -209,10 +209,10 @@ static int may_unmount(const char *mnt, int quiet) } /* - * Check whether the file specified in "fusermount -u" is really a + * Check whether the file specified in "fusermount3 -u" is really a * mountpoint and not a symlink. This is necessary otherwise the user * could move the mountpoint away and replace it with a symlink - * pointing to an arbitrary mount, thereby tricking fusermount into + * pointing to an arbitrary mount, thereby tricking fusermount3 into * unmounting that (umount(2) will follow symlinks). * * This is the child process running in a separate mount namespace, so @@ -780,7 +780,7 @@ static int do_mount(const char *mnt, char **typep, mode_t rootmode, if (getuid() != 0 && !user_allow_other && (opt_eq(s, len, "allow_other") || opt_eq(s, len, "allow_root"))) { - fprintf(stderr, "%s: option %.*s only allowed if 'user_allow_other' is set in /etc/fuse.conf\n", progname, len, s); + fprintf(stderr, "%s: option %.*s only allowed if 'user_allow_other' is set in %s\n", progname, len, s, FUSE_CONF); goto err; } if (!skip_option) { @@ -1022,7 +1022,7 @@ static int mount_fuse(const char *mnt, const char *opts) if (getuid() != 0 && mount_max != -1) { int mount_count = count_fuse_fs(); if (mount_count >= mount_max) { - fprintf(stderr, "%s: too many FUSE filesystems mounted; mount_max=N can be set in /etc/fuse.conf\n", progname); + fprintf(stderr, "%s: too many FUSE filesystems mounted; mount_max=N can be set in %s\n", progname, FUSE_CONF); goto fail_close_fd; } } @@ -1119,7 +1119,7 @@ static void usage(void) static void show_version(void) { - printf("fusermount version: %s\n", PACKAGE_VERSION); + printf("fusermount3 version: %s\n", PACKAGE_VERSION); exit(0); } diff --git a/util/init_script b/util/init_script index 331b33a..4815e7b 100755 --- a/util/init_script +++ b/util/init_script @@ -17,7 +17,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin MOUNTPOINT=/sys/fs/fuse/connections # Gracefully exit if the package has been removed. -which fusermount &>/dev/null || exit 5 +which fusermount3 &>/dev/null || exit 5 case "$1" in start|restart|force-reload) |