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:
9ec6e95
)
factory: install minimal PAM and nsswitch config
author
Kay Sievers
<kay@vrfy.org>
Tue, 29 Jul 2014 14:44:04 +0000
(16:44 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Tue, 29 Jul 2014 14:58:18 +0000
(16:58 +0200)
Makefile.am
patch
|
blob
|
history
tmpfiles.d/etc.conf
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index cd3a2d747d068433bf337ec8d2abd5e2eaa450db..9f2900cb6f14c821b370c764919420ec02df045f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-106,6
+106,8
@@
udevrulesdir=$(udevlibexecdir)/rules.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
+factory_etcdir = $(prefix)/share/factory/etc
+factory_pamdir = $(prefix)/share/factory/etc/pam.d
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-1927,6
+1929,14
@@
INSTALL_DIRS += \
$(sysusersdir)
endif
$(sysusersdir)
endif
+# ------------------------------------------------------------------------------
+dist_factory_etc_DATA = \
+ factory/etc/nsswitch.conf
+
+dist_factory_pam_DATA = \
+ factory/etc/pam.d/system-auth \
+ factory/etc/pam.d/other
+
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
systemd_firstboot_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
systemd_firstboot_SOURCES = \
@@
-1951,7
+1961,6
@@
EXTRA_DIST += \
SYSINIT_TARGET_WANTS += \
systemd-firstboot.service
SYSINIT_TARGET_WANTS += \
systemd-firstboot.service
-
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
diff --git
a/tmpfiles.d/etc.conf
b/tmpfiles.d/etc.conf
index e809dff2aa1eb684f8a1dcd98e142795da9bda04..b23272cb277482704622afc95809856144e0e0ad 100644
(file)
--- a/
tmpfiles.d/etc.conf
+++ b/
tmpfiles.d/etc.conf
@@
-11,3
+11,5
@@
L /etc/os-release - - - - ../usr/lib/os-release
L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
L+ /etc/mtab - - - - ../proc/self/mounts
L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
L+ /etc/mtab - - - - ../proc/self/mounts
L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
+C /etc/nsswitch.conf - - - -
+C /etc/pam.d - - - -