summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-06-20 12:53:28 -0400
committerMike Gilbert <floppym@gentoo.org>2021-06-20 13:18:48 -0400
commitb528f97e26fe1d046152e38cbd199355d380cc98 (patch)
tree7ef466a7923b7931ed20ce98e79c309be104083f /sys-apps
parentsys-apps/systemd: call systemd-hwdb update (diff)
downloadgentoo-b528f97e26fe1d046152e38cbd199355d380cc98.tar.gz
gentoo-b528f97e26fe1d046152e38cbd199355d380cc98.tar.bz2
gentoo-b528f97e26fe1d046152e38cbd199355d380cc98.zip
sys-apps/systemd: simplify systemd-user pam config
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/files/systemd-user.pam5
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild5
2 files changed, 9 insertions, 1 deletions
diff --git a/sys-apps/systemd/files/systemd-user.pam b/sys-apps/systemd/files/systemd-user.pam
new file mode 100644
index 000000000000..38ae3211f8d4
--- /dev/null
+++ b/sys-apps/systemd/files/systemd-user.pam
@@ -0,0 +1,5 @@
+account include system-auth
+
+session required pam_loginuid.so
+session include system-auth
+session optional pam_systemd.so
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3f2168e521b6..41b2a1b5b70e 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -223,7 +223,6 @@ src_prepare() {
"${FILESDIR}/gentoo-generator-path-r2.patch"
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
"${FILESDIR}/gentoo-journald-audit.patch"
- "${FILESDIR}/gentoo-pam-r1.patch"
)
fi
@@ -380,6 +379,10 @@ multilib_src_install_all() {
# Symlink /etc/sysctl.conf for easy migration.
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+ if use pam; then
+ newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+ fi
+
if use hwdb; then
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
fi