diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-11-05 12:44:00 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:18:41 +0000 |
commit | 769c4ebb4f29fbd5c2466df88379458f95afc90a (patch) | |
tree | 581fce91ead3cd39624da24596f6030fe2676bd2 | |
parent | 69767a27cce9161d9a867dcba7c930be525115ad (diff) | |
download | poky-769c4ebb4f29fbd5c2466df88379458f95afc90a.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)
(From OE-Core rev: 95d3c25e5214962053e07102e25a906262bf65c2)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch | 26 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_216.bb | 1 |
2 files changed, 27 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..fbde13f077 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status: Inappropriate [oe specific] | ||
2 | |||
3 | Subject: systemd-user: avoid using system-auth | ||
4 | |||
5 | In OE, we don't provide system-auth, instead, we use common-* files. | ||
6 | So modify systemd-user file to use common-* files. | ||
7 | |||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | src/login/systemd-user | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/login/systemd-user b/src/login/systemd-user | ||
14 | index 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 | -- | ||
26 | 1.9.1 | ||
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb index 8ded3ede50..b8fd425bc9 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 \ |