Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Use correct prefix for share/pam-configs 

Respect the configured install prefix.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10604
This commit is contained in:
Ryan Moeller 2020-07-30 12:09:46 -04:00 committed by GitHub
parent 3a92552f75
commit 2f571dbe06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/user-pam.m4
View File

@ -12,8 +12,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_PAM], [
AC_ARG_WITH(pamconfigsdir, AC_ARG_WITH(pamconfigsdir,
AS_HELP_STRING([--with-pamconfigsdir=DIR], AS_HELP_STRING([--with-pamconfigsdir=DIR],
[install pam-config files in dir [[/usr/share/pamconfigs]]]), [install pam-config files in dir [DATADIR/pam-configs]]),
[pamconfigsdir="$withval"],[pamconfigsdir=/usr/share/pam-configs]) [pamconfigsdir="$withval"],
[pamconfigsdir='${datadir}/pam-configs'])
AS_IF([test "x$enable_pam" != "xno"], [ AS_IF([test "x$enable_pam" != "xno"], [
AC_CHECK_HEADERS([security/pam_modules.h], [ 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"], [ AS_IF([test "x$enable_pam" = "xyes"], [
DEFINE_PAM='--with "pam" --define "_pamconfigsdir $(pamconfigsdir)"' DEFINE_PAM='--with pam'
]) ])
AC_SUBST(DEFINE_PAM) AC_SUBST(DEFINE_PAM)
AC_SUBST(pammoduledir) AC_SUBST(pammoduledir)

6
rpm/generic/zfs.spec.in
View File

@ -348,6 +348,8 @@ image which is ZFS aware.
--with-udevdir=%{_udevdir} \ --with-udevdir=%{_udevdir} \
--with-udevruledir=%{_udevruledir} \ --with-udevruledir=%{_udevruledir} \
--with-dracutdir=%{_dracutdir} \ --with-dracutdir=%{_dracutdir} \
--with-pamconfigsdir=%{_datadir}/pam-configs \
--with-pammoduledir=%{_libdir}/security \
--with-python=%{__python} \ --with-python=%{__python} \
--with-pkgconfigdir=%{_pkgconfigdir} \ --with-pkgconfigdir=%{_pkgconfigdir} \
--disable-static \ --disable-static \
@ -355,7 +357,7 @@ image which is ZFS aware.
%{debuginfo} \ %{debuginfo} \
%{asan} \ %{asan} \
%{systemd} \ %{systemd} \
--with-pammoduledir=%{_libdir}/security %{pam} \ %{pam} \
%{pyzfs} %{pyzfs}
make %{?_smp_mflags} make %{?_smp_mflags}
@ -472,7 +474,7 @@ systemctl --system daemon-reload >/dev/null || true
%attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/* %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
%if %{with pam} %if %{with pam}
%{_libdir}/security/* %{_libdir}/security/*
%{_pamconfigsdir}/* %{_datadir}/pam-configs/*
%endif %endif
%files -n libzpool2 %files -n libzpool2