summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-03-03 11:54:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-03 12:59:28 +0000
commitd01cd53429b1c20f01dac97f1b9b659cb9dc9812 (patch)
treeb4d9e9bd1aa21eaf7ab4fb9a50089f254ec09e2e /meta/recipes-core
parent8d4e621a6ccadcaf904fadec0f1c2b61974e88db (diff)
downloadpoky-d01cd53429b1c20f01dac97f1b9b659cb9dc9812.tar.gz
systemd: fix tmpfiles error on images without PAM
If PAM isn't enabled then systemd-tmpfiles on boot will fail to start with the following error message: Failed to copy files to /etc/pam.d: No such file or directory This is because systemd-tmpfiles is attempting to build a usable /etc from the skeleton in /usr/share/factory but pam.d isn't present because PAM is disabled. Fix this by not attempting to copy pam.d in non-PAM configurations. (From OE-Core rev: 46a54e7991b939f12a729e4d263d19130e0aea78) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/tmpfiles-pam.patch30
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/tmpfiles-pam.patch b/meta/recipes-core/systemd/systemd/tmpfiles-pam.patch
new file mode 100644
index 0000000000..a40b1b9d3f
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/tmpfiles-pam.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 0802aaaa9784813d318d045c79533a044eedf542 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 3 Mar 2015 11:32:29 +0000
7Subject: [PATCH] tmpfiles.d: only copy /etc/pam.d if PAM is present
8
9If HAVE_PAM isn't set then don't attempt to copy /etc/pam.d from the factory, as
10it doesn't get installed.
11
12Signed-off-by: Ross Burton <ross.burton@intel.com>
13---
14 tmpfiles.d/etc.conf.m4 | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
18index 9b0e080..ab5cd16 100644
19--- a/tmpfiles.d/etc.conf.m4
20+++ b/tmpfiles.d/etc.conf.m4
21@@ -14,4 +14,6 @@ m4_ifdef(`ENABLE_RESOLVED',
22 L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
23 )m4_dnl
24 C /etc/nsswitch.conf - - - -
25+m4_ifdef(`HAVE_PAM',
26 C /etc/pam.d - - - -
27+)m4_dnl
28--
291.7.10.4
30
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index f245239c18..24486f1815 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -40,6 +40,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
40 file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ 40 file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \
41 file://0010-Make-root-s-home-directory-configurable.patch \ 41 file://0010-Make-root-s-home-directory-configurable.patch \
42 file://0011-systemd-user-avoid-using-system-auth.patch \ 42 file://0011-systemd-user-avoid-using-system-auth.patch \
43 file://tmpfiles-pam.patch \
43 file://touchscreen.rules \ 44 file://touchscreen.rules \
44 file://00-create-volatile.conf \ 45 file://00-create-volatile.conf \
45 file://init \ 46 file://init \