Skip to content

Commit

Permalink
RPM: Split out pam_zfs_key into separate package
Browse files Browse the repository at this point in the history
Create a separate `pam_zfs_key` package for the PAM module components,
an optional addition to the deliverables, in much the same way as the
Python bindings are released as a separate `python#-pyzfs` package.

This makes it clear when the PAM module is shipped with the package,
since it's now in its own package.

Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com>
Closes: #13026
  • Loading branch information
ColMelvin committed Mar 10, 2022
1 parent 1282274 commit 9b9eeb0
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions rpm/generic/zfs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@ BuildRequires: ncompress
BuildRequires: libtirpc-devel
%endif

%if %{with pam}
BuildRequires: pam-devel
%endif

Requires: openssl
%if 0%{?_systemd}
BuildRequires: systemd
Expand Down Expand Up @@ -326,6 +322,19 @@ This package contains a initramfs module used to construct an initramfs
image which is ZFS aware.
%endif

%if %{with pam}
%package -n pam_zfs_key
Summary: PAM module for encrypted ZFS datasets

%if 0%{?rhel}%{?centos}%{?fedora}%{?suse_version}
BuildRequires: pam-devel
%endif

%description -n pam_zfs_key
This package contains the pam_zfs_key PAM module, which provides
support for unlocking datasets on user login.
%endif

%prep
%if %{with debug}
%define debug --enable-debug
Expand Down Expand Up @@ -508,10 +517,6 @@ systemctl --system daemon-reload >/dev/null || true
%config(noreplace) %{_sysconfdir}/%{name}/zpool.d/*
%config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
%attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
%if %{with pam}
%{_libdir}/security/*
%{_datadir}/pam-configs/*
%endif

%files -n libzpool5
%{_libdir}/libzpool.so.*
Expand Down Expand Up @@ -561,3 +566,9 @@ systemctl --system daemon-reload >/dev/null || true
# ignore those files.
%exclude /usr/share/initramfs-tools
%endif

%if %{with pam}
%files -n pam_zfs_key
%{_libdir}/security/*
%{_datadir}/pam-configs/*
%endif

0 comments on commit 9b9eeb0

Please sign in to comment.