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 /package/util-linux | |
| parent | bf8909ee4c7d9d31b8eb4d3c9264fb87d54f6af2 (diff) | |
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>
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/login.pam | 10 | ||||
| -rw-r--r-- | package/util-linux/util-linux.mk | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/package/util-linux/login.pam b/package/util-linux/login.pam deleted file mode 100644 index 01f56324d..000000000 --- a/package/util-linux/login.pam +++ /dev/null @@ -1,10 +0,0 @@ -auth required pam_unix.so nullok - -account required pam_unix.so - -password required pam_unix.so nullok - -session required pam_limits.so -session required pam_env.so -session required pam_unix.so -session optional pam_lastlog.so diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 141dffdcd..a055d177c 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 \ |