From ae07d5b1990beaab3b9cd77fc0b8f8f502dd4009 Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Thu, 18 Apr 2024 16:49:55 +0200 Subject: [PATCH] Fix package name for libpam-pkcs11 on Ubuntu --- .../smart_card_login/install_smartcard_packages/oval/shared.xml | 2 ++ .../smart_card_login/install_smartcard_packages/rule.yml | 1 + products/ubuntu2204/product.yml | 1 + tests/data/product_stability/ubuntu2204.yml | 1 + 4 files changed, 5 insertions(+) diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/oval/shared.xml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/oval/shared.xml index 14c73051f429..488627d99186 100644 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/oval/shared.xml +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/oval/shared.xml @@ -4,6 +4,8 @@ {{% set smartcard_packages = ['pam_pkcs11', 'mozilla-nss', 'mozilla-nss-tools', 'pcsc-ccid', 'pcsc-lite', 'pcsc-tools', 'opensc'] %}} {{% elif product in ["rhel7", "ol7"] %}} {{% set smartcard_packages = ['pam_pkcs11'] %}} +{{% elif 'ubuntu' in product %}} +{{% set smartcard_packages = ['libpam-pkcs11'] %}} {{% else %}} {{% set smartcard_packages = ['openssl-pkcs11'] %}} {{% endif %}} diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml index 7514548867eb..b528f45e501e 100644 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml @@ -77,6 +77,7 @@ template: pkgname@ubuntu1604: libpam-pkcs11 pkgname@ubuntu1804: libpam-pkcs11 pkgname@ubuntu2004: libpam-pkcs11 + pkgname@ubuntu2204: libpam-pkcs11 {{% endif %}} fixtext: |- diff --git a/products/ubuntu2204/product.yml b/products/ubuntu2204/product.yml index 51aace52859f..7f347443dd8d 100644 --- a/products/ubuntu2204/product.yml +++ b/products/ubuntu2204/product.yml @@ -44,6 +44,7 @@ platform_package_overrides: pam: libpam-runtime shadow: login sssd: sssd-common + openssl-pkcs11: libpam-pkcs11 reference_uris: cis: 'https://www.cisecurity.org/benchmark/ubuntu_linux/' diff --git a/tests/data/product_stability/ubuntu2204.yml b/tests/data/product_stability/ubuntu2204.yml index 628f3caf3950..d8c60dd2f3c4 100644 --- a/tests/data/product_stability/ubuntu2204.yml +++ b/tests/data/product_stability/ubuntu2204.yml @@ -48,6 +48,7 @@ platform_package_overrides: not_aarch64_arch: null not_s390x_arch: null nss-pam-ldapd: libpam-ldap + openssl-pkcs11: libpam-pkcs11 ovirt: null pam: libpam-runtime s390x_arch: null