[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7285/8267] rootfs-postcommands.bbclass: Filter out dangling symlinks in ssh_allow_empty_password()



commit ad140e7788d4cdcb740701850b90c617c76f23d4
Author: Khem Raj <raj khem gmail com>
Date:   Wed Aug 16 22:43:17 2017 -0700

    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)
    
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 c92df7b..e7999d4 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -158,7 +158,10 @@ ssh_allow_empty_password () {
        fi
 
        if [ -d ${IMAGE_ROOTFS}${sysconfdir}/pam.d ] ; then
-               sed -i 's/nullok_secure/nullok/' ${IMAGE_ROOTFS}${sysconfdir}/pam.d/*
+               for f in `find ${IMAGE_ROOTFS}${sysconfdir}/pam.d/* -type f -exec test -e {} \; -print`
+               do
+                       sed -i 's/nullok_secure/nullok/' $f
+               done
        fi
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]