diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-16 22:43:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 16:55:57 +0100 |
commit | 40ce8ca30ca7edc9ec24eb10b5214dd9fca74354 (patch) | |
tree | 3f1ab5983be654d89a75b3679731ebc0a8f80d70 /meta | |
parent | 88455dd53c0fb470ee0d5d29ce783e5c1e88ee6f (diff) | |
download | poky-40ce8ca30ca7edc9ec24eb10b5214dd9fca74354.tar.gz |
rootfs-postcommands.bbclass: Filter out dangling symlinks in ssh_allow_empty_password()
In images built with pam in DISTRO_FEATURES, we end up with dangling symlinks
if su is not packaged into image
$ ls /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-gnueabi/core-image-minimal/1.0-r0/rootfs/etc/pam.d/su-l -l
lrwxrwxrwx 1 kraj users 2 Aug 9 07:56 /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-gnueabi/core-image-minimal/1.0-r0/rootfs/etc/pam.d/su-l -> su
This causes image do_rootfs to fail
| sed: can't read /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-gnueabi/core-image-minimal/1.0-r0/rootfs/etc/pam.d/s
u-l: No such file or directory
| WARNING: /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-gnueabi/core-image-minimal/1.0-r0/temp/run.ssh_allow_empty_
password.19238:1 exit 2 from 'sed -i 's/nullok_secure/nullok/' /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-gnueabi
/core-image-minimal/1.0-r0/rootfs/etc/pam.d/*'
Therefore we need to filter out dangling symlinks before sed'ing
things out
(From OE-Core rev: b92105e5a085c8cd3c650579644922ed97163e73)
(From OE-Core rev: ed1aaf24bfd4a09132c7e0247c460102ec85254d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index c194b264e0..3d605db783 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
@@ -156,7 +156,10 @@ ssh_allow_empty_password () { | |||
156 | fi | 156 | fi |
157 | 157 | ||
158 | if [ -d ${IMAGE_ROOTFS}${sysconfdir}/pam.d ] ; then | 158 | if [ -d ${IMAGE_ROOTFS}${sysconfdir}/pam.d ] ; then |
159 | sed -i 's/nullok_secure/nullok/' ${IMAGE_ROOTFS}${sysconfdir}/pam.d/* | 159 | for f in `find ${IMAGE_ROOTFS}${sysconfdir}/pam.d/* -type f -exec test -e {} \; -print` |
160 | do | ||
161 | sed -i 's/nullok_secure/nullok/' $f | ||
162 | done | ||
160 | fi | 163 | fi |
161 | } | 164 | } |
162 | 165 | ||