chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
factory: install minimal PAM and nsswitch config
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3fb3703c466dc656bf7d517ff9eb6d9c14e85e88..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
# ------------------------------------------------------------------------------
@@
-4086,9
+4095,6
@@
dist_bashcompletion_DATA += \
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
-GENERAL_ALIASES += \
- $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl
-
sysctl_DATA = \
sysctl.d/50-coredump.conf
sysctl_DATA = \
sysctl.d/50-coredump.conf