summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-09-29 17:59:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:33 +0100
commitadb69873a15cebcb2f51cf07bed12b2d8d52ab09 (patch)
treed146c76a6d836d7f6b44216f9a432739442f91e9 /meta/recipes-core
parent9549f57c802eff11974f261340ef0a75a68340f1 (diff)
downloadpoky-adb69873a15cebcb2f51cf07bed12b2d8d52ab09.tar.gz
util-linux: add runuser PAM config files to fix runuser error
The runuser command fails with below error message, add proper PAM config files to fix the problem. The config files are borrowed from CentOS 7.0 release. runuser: Failure setting user credentials (From OE-Core rev: a6616f1a7b8e30428e61b6437f2f48379efc101d) Signed-off-by: Shan Hai <shan.hai@windriver.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
-rw-r--r--meta/recipes-core/util-linux/util-linux/runuser-l.pamd3
-rw-r--r--meta/recipes-core/util-linux/util-linux/runuser.pamd4
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.26.2.bb2
4 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index a4072bc6cf..594108f68c 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -163,6 +163,12 @@ do_install () {
163 echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall 163 echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
164 164
165 rm -f ${D}${bindir}/chkdupexe 165 rm -f ${D}${bindir}/chkdupexe
166
167 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
168 install -d ${D}${sysconfdir}/pam.d
169 install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser
170 install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l
171 fi
166} 172}
167 173
168# reset and nologin causes a conflict with ncurses-native and shadow-native 174# reset and nologin causes a conflict with ncurses-native and shadow-native
diff --git a/meta/recipes-core/util-linux/util-linux/runuser-l.pamd b/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
new file mode 100644
index 0000000000..4b368ccf5d
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
@@ -0,0 +1,3 @@
1auth include runuser
2session optional pam_keyinit.so force revoke
3session include runuser
diff --git a/meta/recipes-core/util-linux/util-linux/runuser.pamd b/meta/recipes-core/util-linux/util-linux/runuser.pamd
new file mode 100644
index 0000000000..48d133b9e7
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/runuser.pamd
@@ -0,0 +1,4 @@
1auth sufficient pam_rootok.so
2session optional pam_keyinit.so revoke
3session required pam_limits.so
4session required pam_unix.so
diff --git a/meta/recipes-core/util-linux/util-linux_2.26.2.bb b/meta/recipes-core/util-linux/util-linux_2.26.2.bb
index fc7dc6e094..e09fdfaf5d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.26.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.26.2.bb
@@ -13,6 +13,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
13 file://uclibc-__progname-conflict.patch \ 13 file://uclibc-__progname-conflict.patch \
14 file://configure-sbindir.patch \ 14 file://configure-sbindir.patch \
15 file://fix-parallel-build.patch \ 15 file://fix-parallel-build.patch \
16 file://runuser.pamd \
17 file://runuser-l.pamd \
16 ${OLDHOST} \ 18 ${OLDHOST} \
17" 19"
18SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb" 20SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb"