From cb47b574638c65305735a31ecc0936f24613176e Mon Sep 17 00:00:00 2001 From: Antonio Russo Date: Wed, 2 Dec 2020 20:18:08 +0100 Subject: [PATCH] Include new pam_zfs_key mechanism (cherry picked from commit 340f9394c38a78b2530a64746c1518163d7f6970) Signed-off-by: Stoiko Ivanov --- debian/rules | 2 ++ debian/zfsutils-linux.install | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 0e168ee..1ce79ad 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,7 @@ override_dh_auto_configure: --enable-systemd \ --enable-pyzfs \ --with-python=python3 \ + --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \ --with-systemdunitdir=/lib/systemd/system \ --with-systemdpresetdir=/lib/systemd/system-preset \ --with-systemdgeneratordir=/lib/systemd/system-generators \ @@ -102,6 +103,7 @@ override_dh_auto_clean: override_dh_missing: find . -name lib*.la -delete + rm debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/pam_zfs_key.la dh_missing --fail-missing override_dh_installdocs: diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install index 77b3ab8..04f0fe4 100644 --- a/debian/zfsutils-linux.install +++ b/debian/zfsutils-linux.install @@ -2,6 +2,7 @@ etc/default/zfs etc/zfs/zfs-functions etc/zfs/zpool.d/ +lib/*/security/pam_zfs_key.so lib/systemd/system-preset/ lib/systemd/system/zfs-import-cache.service lib/systemd/system/zfs-import-scan.service @@ -118,3 +119,4 @@ usr/share/man/man8/zpoolconcepts.8 usr/share/man/man8/zpoolprops.8 usr/share/man/man8/zstream.8 usr/share/man/man8/zstreamdump.8 +usr/share/pam-configs/zfs_key