From d01cd53429b1c20f01dac97f1b9b659cb9dc9812 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Mar 2015 11:54:25 +0000 Subject: 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 Signed-off-by: Richard Purdie --- .../systemd/systemd/tmpfiles-pam.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/tmpfiles-pam.patch (limited to 'meta/recipes-core/systemd/systemd/tmpfiles-pam.patch') 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 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 0802aaaa9784813d318d045c79533a044eedf542 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 3 Mar 2015 11:32:29 +0000 +Subject: [PATCH] tmpfiles.d: only copy /etc/pam.d if PAM is present + +If HAVE_PAM isn't set then don't attempt to copy /etc/pam.d from the factory, as +it doesn't get installed. + +Signed-off-by: Ross Burton +--- + tmpfiles.d/etc.conf.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 +index 9b0e080..ab5cd16 100644 +--- a/tmpfiles.d/etc.conf.m4 ++++ b/tmpfiles.d/etc.conf.m4 +@@ -14,4 +14,6 @@ m4_ifdef(`ENABLE_RESOLVED', + L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf + )m4_dnl + C /etc/nsswitch.conf - - - - ++m4_ifdef(`HAVE_PAM', + C /etc/pam.d - - - - ++)m4_dnl +-- +1.7.10.4 + -- cgit v1.2.3-54-g00ecf