| 1 |
commit: 448091cb54719cb8c1bb02466dbb4051a10fff0b |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 30 13:35:47 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 14:22:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448091cb |
| 7 |
|
| 8 |
x11-misc/sddm: Add ewarn for erroneous existing pambase config |
| 9 |
|
| 10 |
Previous recommendation for sddm without real consolekit support breaks |
| 11 |
modern sddm with consolekit2 support. |
| 12 |
|
| 13 |
x11-misc/sddm/sddm-0.12.0-r1.ebuild | 14 ++++++++++++++ |
| 14 |
x11-misc/sddm/sddm-0.13.0-r1.ebuild | 14 ++++++++++++++ |
| 15 |
2 files changed, 28 insertions(+) |
| 16 |
|
| 17 |
diff --git a/x11-misc/sddm/sddm-0.12.0-r1.ebuild b/x11-misc/sddm/sddm-0.12.0-r1.ebuild |
| 18 |
index 2b31915..c472cbc 100644 |
| 19 |
--- a/x11-misc/sddm/sddm-0.12.0-r1.ebuild |
| 20 |
+++ b/x11-misc/sddm/sddm-0.12.0-r1.ebuild |
| 21 |
@@ -62,4 +62,18 @@ src_configure() { |
| 22 |
pkg_postinst() { |
| 23 |
enewgroup ${PN} |
| 24 |
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video |
| 25 |
+ |
| 26 |
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then |
| 27 |
+ local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) |
| 28 |
+ if [[ -z ${line} ]]; then |
| 29 |
+ ewarn |
| 30 |
+ ewarn "Erroneous /etc/pam.d/system-login settings detected!" |
| 31 |
+ ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" |
| 32 |
+ ewarn |
| 33 |
+ ewarn "session optional pam_ck_connector.so nox11" |
| 34 |
+ ewarn |
| 35 |
+ ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." |
| 36 |
+ ewarn |
| 37 |
+ fi |
| 38 |
+ fi |
| 39 |
} |
| 40 |
|
| 41 |
diff --git a/x11-misc/sddm/sddm-0.13.0-r1.ebuild b/x11-misc/sddm/sddm-0.13.0-r1.ebuild |
| 42 |
index 7c61eb0..8b55dfb 100644 |
| 43 |
--- a/x11-misc/sddm/sddm-0.13.0-r1.ebuild |
| 44 |
+++ b/x11-misc/sddm/sddm-0.13.0-r1.ebuild |
| 45 |
@@ -62,4 +62,18 @@ src_configure() { |
| 46 |
pkg_postinst() { |
| 47 |
enewgroup ${PN} |
| 48 |
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video |
| 49 |
+ |
| 50 |
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then |
| 51 |
+ local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) |
| 52 |
+ if [[ -z ${line} ]]; then |
| 53 |
+ ewarn |
| 54 |
+ ewarn "Erroneous /etc/pam.d/system-login settings detected!" |
| 55 |
+ ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" |
| 56 |
+ ewarn |
| 57 |
+ ewarn "session optional pam_ck_connector.so nox11" |
| 58 |
+ ewarn |
| 59 |
+ ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." |
| 60 |
+ ewarn |
| 61 |
+ fi |
| 62 |
+ fi |
| 63 |
} |
Archives