Patchwork [v2] systemd: fix systemd-user pam configuration

login
register
mail settings
Submitter danismostlikely@gmail.com
Date April 23, 2014, 7:08 p.m.
Message ID <CACS+7ZQ0=-3Mi9Nc1w12ZAcCdr9cAubXe1xDDRA8tfE2fBR=eA@mail.gmail.com>
Download mbox | patch
Permalink /patch/70817/
State New
Headers show

Comments

danismostlikely@gmail.com - April 23, 2014, 7:08 p.m.
From: Dan McGregor <dan.mcgregor@usask.ca>

Use common-auth and common-session files instead of system-auth.
system-auth is a convention that oe-core doesn't follow. This
fixes an issue where the systemd user session manager fails to
start.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 .../systemd/systemd-pam-fix-systemd-user.patch     | 37 ++++++++++++++++++++++
 meta/recipes-core/systemd/systemd_211.bb           |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644
meta/recipes-core/systemd/systemd/systemd-pam-fix-systemd-user.patch

            file://uclibc-sysinfo_h.patch \

Patch

diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-systemd-user.patch
b/meta/recipes-core/systemd/systemd/systemd-pam-fix-systemd-user.patch
new file mode 100644
index 0000000..9aa024b
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-systemd-user.patch
@@ -0,0 +1,37 @@ 
+From a46c9c81f7b03037338cdeed5f491f16e0252328 Mon Sep 17 00:00:00 2001
+From: Dan McGregor <dan.mcgregor@usask.ca>
+Date: Thu, 13 Mar 2014 10:16:27 -0600
+Subject: [PATCH] Use common-auth and common-session for logind
+
+Use common-auth and common-session files in systemd-user's pam
+configuration instead of system-auth.  system-auth is used in
+RedHat, Fedora, Arch, and others. OpenEmbedded, Debian, and OpenSUSE
+use common-auth, common-session, and common-account.
+
+Upstream tracks the system-auth method because it seems to be more
+popular and is easier for them.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
+---
+ src/login/systemd-user | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/login/systemd-user b/src/login/systemd-user
+index 7b57dbf..c0fc793 100644
+--- a/src/login/systemd-user
++++ b/src/login/systemd-user
+@@ -2,7 +2,7 @@
+
+ # Used by systemd when launching systemd user instances.
+
+-account include system-auth
+-session include system-auth
++account include common-account
++session include common-session
+ auth required pam_deny.so
+ password required pam_deny.so
+--
+1.9.0
+
diff --git a/meta/recipes-core/systemd/systemd_211.bb
b/meta/recipes-core/systemd/systemd_211.bb
index 44b1965..df632ab 100644
--- a/meta/recipes-core/systemd/systemd_211.bb
+++ b/meta/recipes-core/systemd/systemd_211.bb
@@ -27,6 +27,7 @@  SRC_URI =
"git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
            file://systemd-pam-fix-execvpe.patch \
            file://systemd-pam-fix-fallocate.patch \
            file://systemd-pam-fix-mkostemp.patch \
+           file://systemd-pam-fix-systemd-user.patch \
            file://optional_secure_getenv.patch \
            file://0001-uClibc-doesn-t-implement-pwritev-preadv.patch \