jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-pam: install login.pam from here

Browse Source 
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:
Gustavo Zacarias 2016-03-28 21:39:56 -03:00 committed by Thomas Petazzoni
parent bf8909ee4c
commit b71a0176c4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/linux-pam/linux-pam.mk
View File

@ -26,8 +26,10 @@ LINUX_PAM_DEPENDENCIES += gettext
LINUX_PAM_MAKE_OPTS += LIBS=-lintl LINUX_PAM_MAKE_OPTS += LIBS=-lintl
endif endif
# Install default pam config (deny everything) # Install default pam config (deny everything except login)
define LINUX_PAM_INSTALL_CONFIG 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 \ $(INSTALL) -m 0644 -D package/linux-pam/other.pam \
$(TARGET_DIR)/etc/pam.d/other $(TARGET_DIR)/etc/pam.d/other
endef endef

0
package/util-linux/login.pam → package/linux-pam/login.pam
View File

2
package/util-linux/util-linux.mk
View File

@ -153,8 +153,6 @@ endif
# Install PAM configuration files # Install PAM configuration files
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y) ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
define UTIL_LINUX_INSTALL_PAMFILES 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 \ $(INSTALL) -m 0644 package/util-linux/su.pam \
$(TARGET_DIR)/etc/pam.d/su $(TARGET_DIR)/etc/pam.d/su
$(INSTALL) -m 0644 package/util-linux/su.pam \ $(INSTALL) -m 0644 package/util-linux/su.pam \