Permalink
Browse files

Set IGNORE_MTAB when running under NetBSD

Apparently, NetBSD does not have /etc/mtab. Setting IGNORE_MTAB
in this case makes the code a little nicer.

See also #123
  • Loading branch information...
1 parent 0fa25d0 commit ac25c153691faea65cbfc1b0781b8b0dab3f4b29 @Nikratio Nikratio committed Dec 24, 2016
Showing with 6 additions and 4 deletions.
  1. +2 −1 configure.ac
  2. +0 −2 lib/mount.c
  3. +4 −1 lib/mount_util.c
View
@@ -54,7 +54,8 @@ fi
if test "$enable_test" != "no"; then
subdirs2="$subdirs2 test";
fi
-if test "$enable_mtab" = "no"; then
+if test "$enable_mtab" = "no" -o \
+ "$arch" = "netbsd"; then
AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab])
fi
View
@@ -481,7 +481,6 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
goto out_close;
}
-#ifndef __NetBSD__
#ifndef IGNORE_MTAB
if (geteuid() == 0) {
char *newmnt = fuse_mnt_resolve_path("fuse", mnt);
@@ -496,7 +495,6 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
goto out_umount;
}
#endif /* IGNORE_MTAB */
-#endif /* __NetBSD__ */
free(type);
free(source);
View
@@ -30,6 +30,9 @@
#ifdef __NetBSD__
#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0)
+#endif
+
+#ifdef IGNORE_MTAB
#define mtab_needs_update(mnt) 0
#else
static int mtab_needs_update(const char *mnt)
@@ -75,7 +78,7 @@ static int mtab_needs_update(const char *mnt)
return 1;
}
-#endif /* __NetBSD__ */
+#endif /* IGNORE_MTAB */
static int add_mount(const char *progname, const char *fsname,
const char *mnt, const char *type, const char *opts)

0 comments on commit ac25c15

Please sign in to comment.