]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
util-linux: add runuser PAM config files to fix runuser error
authorChen Qi <Qi.Chen@windriver.com>
Tue, 29 Sep 2015 09:59:02 +0000 (17:59 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 29 Sep 2015 14:15:48 +0000 (15:15 +0100)
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

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>
meta/recipes-core/util-linux/util-linux.inc
meta/recipes-core/util-linux/util-linux/runuser-l.pamd [new file with mode: 0644]
meta/recipes-core/util-linux/util-linux/runuser.pamd [new file with mode: 0644]
meta/recipes-core/util-linux/util-linux_2.26.2.bb

index a4072bc6cf41203b96d0edcdcae673a8f4ef5d9a..594108f68c563ed493b68df37abd740aa446d5fe 100644 (file)
@@ -163,6 +163,12 @@ do_install () {
        echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
        rm -f ${D}${bindir}/chkdupexe
+
+       if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
+               install -d ${D}${sysconfdir}/pam.d
+               install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser
+               install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l
+       fi
 }
 
 # 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 (file)
index 0000000..4b368cc
--- /dev/null
@@ -0,0 +1,3 @@
+auth   include         runuser
+session        optional        pam_keyinit.so force revoke
+session 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 (file)
index 0000000..48d133b
--- /dev/null
@@ -0,0 +1,4 @@
+auth   sufficient      pam_rootok.so
+session        optional        pam_keyinit.so revoke
+session        required        pam_limits.so
+session        required        pam_unix.so
index fc7dc6e094e3fdc35a3ae786c3534093102300f3..e09fdfaf5d06b78eb719c31eab48e008f06f455e 100644 (file)
@@ -13,6 +13,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://uclibc-__progname-conflict.patch \
             file://configure-sbindir.patch \
             file://fix-parallel-build.patch \
+            file://runuser.pamd \
+            file://runuser-l.pamd \
             ${OLDHOST} \
 "
 SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb"