summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-11-05 12:44:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-12 15:38:30 +0000
commit2abfdcfd1c2f8d450f482fbf6922c5d2371d0aef (patch)
tree21e8ec6988e1f535eac0ca9f8919bad15143cb4e /meta/recipes-core/systemd
parente9b729d75c2ac3548021de78a25ea7f2511ab6cb (diff)
downloadpoky-2abfdcfd1c2f8d450f482fbf6922c5d2371d0aef.tar.gz
systemd: avoid using system-auth
Patch systemd-user pam configuartion file to avoid using system-auth file. Instead, we use common-* files. (From OE-Core rev: a3c863c4a65737a410a0353d97a0ee538eb82434) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch27
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch
new file mode 100644
index 0000000000..97701f707c
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch
@@ -0,0 +1,27 @@
1Upstream-Status: Inappropriate [oe specific]
2
3Subject: systemd-user: avoid using system-auth
4
5In OE, we don't provide system-auth, instead, we use common-* files.
6So modify systemd-user file to use common-* files.
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 src/login/systemd-user | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/src/login/systemd-user b/src/login/systemd-user
14index 8112d74..99635af 100644
15--- a/src/login/systemd-user
16+++ b/src/login/systemd-user
17@@ -2,5 +2,5 @@
18 #
19 # Used by systemd --user instances.
20
21-account include system-auth
22-session include system-auth
23+account include common-account
24+session include common-session
25--
261.9.1
27
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index 27a5d926ff..ac35ba6388 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -33,6 +33,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
33 file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \ 33 file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \
34 file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \ 34 file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \
35 file://0001-Make-root-s-home-directory-configurable.patch \ 35 file://0001-Make-root-s-home-directory-configurable.patch \
36 file://0001-systemd-user-avoid-using-system-auth.patch \
36 file://touchscreen.rules \ 37 file://touchscreen.rules \
37 file://00-create-volatile.conf \ 38 file://00-create-volatile.conf \
38 file://init \ 39 file://init \