diff options
| -rw-r--r-- | cmd/mount_zfs/Makefile.am | 2 | ||||
| -rw-r--r-- | config/mount-helper.m4 | 8 | ||||
| -rw-r--r-- | config/user.m4 | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am index e5f3d083b..2e5663173 100644 --- a/cmd/mount_zfs/Makefile.am +++ b/cmd/mount_zfs/Makefile.am @@ -8,7 +8,7 @@ DEFAULT_INCLUDES += \ # Ignore the prefix for the mount helper. It must be installed in /sbin/ # because this path is hardcoded in the mount(8) for security reasons. # -sbindir=/sbin +sbindir=$(mounthelperdir) sbin_PROGRAMS = mount.zfs mount_zfs_SOURCES = \ diff --git a/config/mount-helper.m4 b/config/mount-helper.m4 new file mode 100644 index 000000000..ad494f1e5 --- /dev/null +++ b/config/mount-helper.m4 @@ -0,0 +1,8 @@ +AC_DEFUN([ZFS_AC_CONFIG_USER_MOUNT_HELPER], [ + AC_ARG_WITH(mounthelperdir, + AC_HELP_STRING([--with-mounthelperdir=DIR], + [install mount.zfs in dir [[/sbin]]]), + mounthelperdir=$withval,mounthelperdir=$sbindir) + + AC_SUBST(mounthelperdir) +]) diff --git a/config/user.m4 b/config/user.m4 index d7ac3f24f..7f7942082 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -2,6 +2,7 @@ dnl # dnl # Default ZFS user configuration dnl # AC_DEFUN([ZFS_AC_CONFIG_USER], [ + ZFS_AC_CONFIG_USER_MOUNT_HELPER ZFS_AC_CONFIG_USER_UDEV ZFS_AC_CONFIG_USER_SYSTEMD ZFS_AC_CONFIG_USER_SYSVINIT |