diff options
| author | Ryan Moeller <[email protected]> | 2020-07-30 12:09:46 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-30 09:09:46 -0700 |
| commit | 2f571dbe06e3d65a3ddadca54d94e4ee2798529d (patch) | |
| tree | f29e8e016f223ec007a7707d92524c80ee8556ec | |
| parent | 3a92552f755543c02c71aa29d680261907b1bea3 (diff) | |
Use correct prefix for share/pam-configs
Respect the configured install prefix.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Arvind Sankar <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10604
| -rw-r--r-- | config/user-pam.m4 | 7 | ||||
| -rw-r--r-- | rpm/generic/zfs.spec.in | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/config/user-pam.m4 b/config/user-pam.m4 index fc29a1e1b..9db35808c 100644 --- a/config/user-pam.m4 +++ b/config/user-pam.m4 @@ -12,8 +12,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_PAM], [ AC_ARG_WITH(pamconfigsdir, AS_HELP_STRING([--with-pamconfigsdir=DIR], - [install pam-config files in dir [[/usr/share/pamconfigs]]]), - [pamconfigsdir="$withval"],[pamconfigsdir=/usr/share/pam-configs]) + [install pam-config files in dir [DATADIR/pam-configs]]), + [pamconfigsdir="$withval"], + [pamconfigsdir='${datadir}/pam-configs']) AS_IF([test "x$enable_pam" != "xno"], [ AC_CHECK_HEADERS([security/pam_modules.h], [ @@ -29,7 +30,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_PAM], [ ]) ]) AS_IF([test "x$enable_pam" = "xyes"], [ - DEFINE_PAM='--with "pam" --define "_pamconfigsdir $(pamconfigsdir)"' + DEFINE_PAM='--with pam' ]) AC_SUBST(DEFINE_PAM) AC_SUBST(pammoduledir) diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index e0bed4cc4..e715c8569 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -348,6 +348,8 @@ image which is ZFS aware. --with-udevdir=%{_udevdir} \ --with-udevruledir=%{_udevruledir} \ --with-dracutdir=%{_dracutdir} \ + --with-pamconfigsdir=%{_datadir}/pam-configs \ + --with-pammoduledir=%{_libdir}/security \ --with-python=%{__python} \ --with-pkgconfigdir=%{_pkgconfigdir} \ --disable-static \ @@ -355,7 +357,7 @@ image which is ZFS aware. %{debuginfo} \ %{asan} \ %{systemd} \ - --with-pammoduledir=%{_libdir}/security %{pam} \ + %{pam} \ %{pyzfs} make %{?_smp_mflags} @@ -472,7 +474,7 @@ systemctl --system daemon-reload >/dev/null || true %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/* %if %{with pam} %{_libdir}/security/* -%{_pamconfigsdir}/* +%{_datadir}/pam-configs/* %endif %files -n libzpool2 |