chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6cccd8
)
tmpfiles.d: only copy /etc/pam.d if PAM is present
author
Ross Burton
<ross.burton@intel.com>
Tue, 3 Mar 2015 11:37:52 +0000
(11:37 +0000)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 3 Mar 2015 17:55:34 +0000
(12:55 -0500)
If HAVE_PAM isn't set then don't attempt to copy /etc/pam.d from the
factory, as it doesn't get installed.
tmpfiles.d/etc.conf.m4
patch
|
blob
|
history
diff --git
a/tmpfiles.d/etc.conf.m4
b/tmpfiles.d/etc.conf.m4
index 9b0e080e6fcd4d96830a6facd34f2c526bac6f05..ab5cd16f24ae8d72455e120576b6404621cc9822 100644
(file)
--- 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