diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2016-03-28 21:39:56 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-29 02:46:31 +0200 |
| commit | b71a0176c4ca8952c364aad693136c69a268915f (patch) | |
| tree | bb229d67f6a3cafb09cfe339d6c73326b0845672 | |
| parent | bf8909ee4c7d9d31b8eb4d3c9264fb87d54f6af2 (diff) | |
| download | buildroot-b71a0176c4ca8952c364aad693136c69a268915f.tar.gz buildroot-b71a0176c4ca8952c364aad693136c69a268915f.zip | |
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>
| -rw-r--r-- | package/linux-pam/linux-pam.mk | 4 | ||||
| -rw-r--r-- | package/linux-pam/login.pam (renamed from package/util-linux/login.pam) | 0 | ||||
| -rw-r--r-- | package/util-linux/util-linux.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index cf1b5b7b11..71c5490c7c 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -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 diff --git a/package/util-linux/login.pam b/package/linux-pam/login.pam index 01f56324da..01f56324da 100644 --- a/package/util-linux/login.pam +++ b/package/linux-pam/login.pam diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 141dffdcd0..a055d177c5 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -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 \ |
