From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <s.ivanov@proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 678F1612B9 for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:19:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 16FDB1FD3A for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id AD7F91FCCA for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 76F8144C5F for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:35 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pve-devel@lists.proxmox.com Date: Wed, 2 Dec 2020 20:18:08 +0100 Message-Id: <20201202191809.13270-10-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201202191809.13270-1-s.ivanov@proxmox.com> References: <20201202191809.13270-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux 8/9] Include new pam_zfs_key mechanism X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Wed, 02 Dec 2020 19:19:08 -0000 From: Antonio Russo <aerusso@aerusso.net> (cherry picked from commit 340f9394c38a78b2530a64746c1518163d7f6970) Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- debian/rules | 2 ++ debian/zfsutils-linux.install | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 0e168ee1..1ce79add 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 77b3ab88..04f0fe48 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 -- 2.20.1