linux-pam: install login.pam from here
Instead of installing login.pam (/etc/pam.d/login) from util-linux conditionally do so unconditionally from linux-pam. If busybox login is pam-enabled (linux-pam package enabled) it will be required, otherwise it will lead to a system where login won't work, and if util-linux is enabled it will supercede busybox login and will be necesarry regardless. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
bf8909ee4c
commit
b71a0176c4
@ -26,8 +26,10 @@ LINUX_PAM_DEPENDENCIES += gettext
|
||||
LINUX_PAM_MAKE_OPTS += LIBS=-lintl
|
||||
endif
|
||||
|
||||
# Install default pam config (deny everything)
|
||||
# Install default pam config (deny everything except login)
|
||||
define LINUX_PAM_INSTALL_CONFIG
|
||||
$(INSTALL) -m 0644 -D package/linux-pam/login.pam \
|
||||
$(TARGET_DIR)/etc/pam.d/login
|
||||
$(INSTALL) -m 0644 -D package/linux-pam/other.pam \
|
||||
$(TARGET_DIR)/etc/pam.d/other
|
||||
endef
|
||||
|
@ -153,8 +153,6 @@ endif
|
||||
# Install PAM configuration files
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
|
||||
define UTIL_LINUX_INSTALL_PAMFILES
|
||||
$(INSTALL) -m 0644 package/util-linux/login.pam \
|
||||
$(TARGET_DIR)/etc/pam.d/login
|
||||
$(INSTALL) -m 0644 package/util-linux/su.pam \
|
||||
$(TARGET_DIR)/etc/pam.d/su
|
||||
$(INSTALL) -m 0644 package/util-linux/su.pam \
|
||||
|
Loading…
Reference in New Issue
Block a user