summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-01-30 14:35:47 +0100
committerMichael Palimaka <kensington@gentoo.org>2016-01-31 01:22:12 +1100
commit448091cb54719cb8c1bb02466dbb4051a10fff0b (patch)
tree185d52517db62f9fa46d2be64cf55a35c4c3b72e /x11-misc
parentapp-crypt/keynote: add SLOT for dev-libs/openssl (diff)
downloadgentoo-448091cb54719cb8c1bb02466dbb4051a10fff0b.tar.gz
gentoo-448091cb54719cb8c1bb02466dbb4051a10fff0b.tar.bz2
gentoo-448091cb54719cb8c1bb02466dbb4051a10fff0b.zip
x11-misc/sddm: Add ewarn for erroneous existing pambase config
Previous recommendation for sddm without real consolekit support breaks modern sddm with consolekit2 support.
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/sddm/sddm-0.12.0-r1.ebuild14
-rw-r--r--x11-misc/sddm/sddm-0.13.0-r1.ebuild14
2 files changed, 28 insertions, 0 deletions
diff --git a/x11-misc/sddm/sddm-0.12.0-r1.ebuild b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
index 2b319152b5b2..c472cbc8756e 100644
--- a/x11-misc/sddm/sddm-0.12.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
@@ -62,4 +62,18 @@ src_configure() {
pkg_postinst() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
+ local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
+ if [[ -z ${line} ]]; then
+ ewarn
+ ewarn "Erroneous /etc/pam.d/system-login settings detected!"
+ ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
+ ewarn
+ ewarn "session optional pam_ck_connector.so nox11"
+ ewarn
+ ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
+ ewarn
+ fi
+ fi
}
diff --git a/x11-misc/sddm/sddm-0.13.0-r1.ebuild b/x11-misc/sddm/sddm-0.13.0-r1.ebuild
index 7c61eb01d550..8b55dfbb71d6 100644
--- a/x11-misc/sddm/sddm-0.13.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.13.0-r1.ebuild
@@ -62,4 +62,18 @@ src_configure() {
pkg_postinst() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
+ local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
+ if [[ -z ${line} ]]; then
+ ewarn
+ ewarn "Erroneous /etc/pam.d/system-login settings detected!"
+ ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
+ ewarn
+ ewarn "session optional pam_ck_connector.so nox11"
+ ewarn
+ ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
+ ewarn
+ fi
+ fi
}