From patchwork Thu Aug 17 05:43:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 110296 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1732668qge; Wed, 16 Aug 2017 22:43:34 -0700 (PDT) X-Received: by 10.101.88.136 with SMTP id d8mr3928008pgu.376.1502948614840; Wed, 16 Aug 2017 22:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502948614; cv=none; d=google.com; s=arc-20160816; b=DpN1f6i1TFB2nTmVtFz7UGGY9XlwmubYL4LCnUp8h++z/yyHGMqnj7tL0EPxhfpMKk PY4rTlLduPAh5rekfLrRyu5R200Z1Ccbh1EqMuxUwTaVcCgaASNvYagPHJkmnCvSAF+J TPgXAXJkIKdLOv/Z9oMnRiU2XV+p2VEMRjXzwvECkWZVkujEdF8rf1WFBekJ2JmZAc6r gXh36H+qPalZ0o0dLE1JxMi5xYBV9whSFWL1LH/MMMxhhdM8R0jfTzEggpKcC6nNBvV1 RAIeqzvXs4i1Km8vNSZDv3RlTVyYraQL2ANqxHhZ+SE29iP8bDZlTk76xjZFShpvUcQK uzZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Q4an8Wi4q3f57q50R9ZrykItWWofTdA87iqyliU18xw=; b=Qidqtvh+B7ShPFRA54Mt0C164Z0toHo590aI2SiC2AiAtv+rcSDT/46wCbqv3h5v+9 e70OinrTkWzNIa8BE/Dwz7miCc4wf78Q6lW4jDr0pck5XPmJOFvAY1Q5Oj3mcpEACJ8I neDByHJQe1LASoPujBaieR1+GahYjqK5Gylsvow9oOcZW/FCtBIhzMhcVopWEp1C0wze OJWOaADo3j6uVjJYShFfoK1AbnFSfwnWFFaeNZ9skIUrnfpF72RGvSKHlmQD6cqJ28KE iun3zlnMdyebSA6Vb5ETIsRrJ6VRun5WBmFqF4z862+34mdr1/AblCcLx4jHwkVPvZEQ 7K7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WdFKREXf; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t133si1485601pgb.809.2017.08.16.22.43.34; Wed, 16 Aug 2017 22:43:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WdFKREXf; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 90C4B783D9; Thu, 17 Aug 2017 05:43:28 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by mail.openembedded.org (Postfix) with ESMTP id 8D4C0783FA for ; Thu, 17 Aug 2017 05:43:26 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id v189so35616870pgd.2 for ; Wed, 16 Aug 2017 22:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Q0ODo4nfc0AnByn4ODBEdAfiUrW3Z3bIjKI07EASHqI=; b=WdFKREXfRwKOIHfz55i1wDAANUY835mXDZzMu6txGjnMC3IdkhrZDo7P84+Th5Vswc 5yPXY79kAzA092oJHx1wrMOJQJUbN/R3Bm5eG4rne5RwU6cIe483EEF12m/r3U88t9ZR qEFJK/FTkUtOupxtYBgJe13s9M4jxe6827p/YevUR9IZsbhCMLXA8U6o8frclNnLfCEI 5tqmYxfFVUjk/WKvw2tRBVga3brGvRZzKgKLh1Czsa2YQ8D0VtfFb3N5XT0xyYQvnMo0 +6qRumTv4NOoBBRmGSzRJ8zASMgWxWxWoEXbBv2xEHmyRmv/LbmdiA4jiyOToSLQ5hL9 wj5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Q0ODo4nfc0AnByn4ODBEdAfiUrW3Z3bIjKI07EASHqI=; b=AiXcFPbe6ewdTKJEpNN3tggnoVAYwkPLK7aVpgIfaw41BLcIFrKIQM3a+6UWRM4lBj ixK5kbgJNYBluOXL9zLNp+C8YnOq3UOW6wmgm6GgWdJqDW7ynz8mnE/j3rZ482ffClHj GdZtZlJPcSbmzB0h3KErtSnSpfb33BJEhmc/5k/JfVSB/dN/Ja/r12KuLvGgCLmLhTOl IUvceDdMC6fxqXPtxvonyRQD2Gkyxeb/TWeAXIwrmpgPO2cUxjGsGCY+20pBvpytgYMr H3Nk2S9obuAqzTBZBYIMya1RvA9V+zAzsM6U2iqlJyu29HpESmAD0F6oCXs0yL3ZpNcF U9vQ== X-Gm-Message-State: AHYfb5j/3ZT7jdJuvTkE9oP6MkwJk5d2lIHWMZZR6EJ0CA7f0rMgFmnm EDHWeOhOXKZigpNX X-Received: by 10.98.245.20 with SMTP id n20mr4019097pfh.46.1502948607655; Wed, 16 Aug 2017 22:43:27 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::8319]) by smtp.gmail.com with ESMTPSA id v11sm6355263pfl.101.2017.08.16.22.43.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 22:43:26 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 16 Aug 2017 22:43:17 -0700 Message-Id: <20170817054317.25113-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [OE-core] [PATCH V2] rootfs-postcommands.bbclass: Filter out dangling symlinks in ssh_allow_empty_password() X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 Signed-off-by: Khem Raj --- meta/classes/rootfs-postcommands.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.14.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 78f7c55933..576e4733eb 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 }