diff options
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 84c7012752..1fa82363b1 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -190,20 +190,19 @@ do_install () { | |||
190 | echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall | 190 | echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall |
191 | 191 | ||
192 | rm -f ${D}${bindir}/chkdupexe | 192 | rm -f ${D}${bindir}/chkdupexe |
193 | } | ||
193 | 194 | ||
194 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 195 | do_install_append_class-target () { |
196 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | ||
195 | install -d ${D}${sysconfdir}/pam.d | 197 | install -d ${D}${sysconfdir}/pam.d |
196 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 198 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
197 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l | 199 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l |
198 | fi | ||
199 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | ||
200 | # Required for "su -" aka "su --login" because | 200 | # Required for "su -" aka "su --login" because |
201 | # otherwise it uses "other", which has "auth pam_deny.so" | 201 | # otherwise it uses "other", which has "auth pam_deny.so" |
202 | # and thus prevents the operation. | 202 | # and thus prevents the operation. |
203 | ln -s su ${D}${sysconfdir}/pam.d/su-l | 203 | ln -s su ${D}${sysconfdir}/pam.d/su-l |
204 | fi | 204 | fi |
205 | } | 205 | } |
206 | |||
207 | # nologin causes a conflict with shadow-native | 206 | # nologin causes a conflict with shadow-native |
208 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) | 207 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) |
209 | do_install_append_class-native () { | 208 | do_install_append_class-native () { |