From patchwork Thu Mar 10 10:06:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 5042 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5660FC433F5 for ; Thu, 10 Mar 2022 10:06:31 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.7705.1646906785761710079 for ; Thu, 10 Mar 2022 02:06:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=k/tdpj8u; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: ch@denx.de) Received: from localhost (dslb-002-205-233-017.002.205.pools.vodafone-ip.de [2.205.233.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 9B97E80F92; Thu, 10 Mar 2022 11:06:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1646906782; bh=kUHL25LsD7qD3LkkRFKnWdfPYWAE2E0YbXa/k/X6HIA=; h=From:To:Cc:Subject:Date:From; b=k/tdpj8uWSzmPqO0fy9sdGYSG1psP6hJ1ZZgoP3VaF5UUZ8SF+81w45yJHp6l48hY v7OIh9icyzCbg5nGFjGcC0tjSxsmJpdcPDeQyrGWh1Z+LXXRvtwoxkv1ZnC9+bwwy+ Z0ePH+8cxpiI7XpSSm/ANQPacaBs5oivkToNwO73K3nS1vCANBrHhj59/jP8t6W7t+ xOKZRl4uk3UoXkDsAfzSrlWCLwRPKElwkEBiQnZezkCRn84XZ+qI58xni/nVN8iK7z fm+kUF5pQHGEEjrtSm2VihC0qhJFixWzd3/gK+5wsgYXeVESBjONkxyMtLSCmU3572 F3s+PY039/4lQ== From: Claudius Heine To: openembedded-core@lists.openembedded.org Cc: Vyacheslav Yurkov , Claudius Heine Subject: [PATCH 1/2] files: overlayfs-etc: wrap long lines of preinit file Date: Thu, 10 Mar 2022 11:06:08 +0100 Message-Id: <20220310100609.2881374-1-ch@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Mar 2022 10:06:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163005 Make it easier to see what is happening by wrapping the overly long lines in the preinit file for the overlayfs-etc. Signed-off-by: Claudius Heine --- meta/files/overlayfs-etc-preinit.sh.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/files/overlayfs-etc-preinit.sh.in b/meta/files/overlayfs-etc-preinit.sh.in index 2ebb6c9224..1daf83513e 100644 --- a/meta/files/overlayfs-etc-preinit.sh.in +++ b/meta/files/overlayfs-etc-preinit.sh.in @@ -16,11 +16,18 @@ mount -t sysfs sysfs /sys [ -z "$CONSOLE" ] && CONSOLE="/dev/console" mkdir -p {OVERLAYFS_ETC_MOUNT_POINT} -if mount -n -t {OVERLAYFS_ETC_FSTYPE} -o {OVERLAYFS_ETC_MOUNT_OPTIONS} {OVERLAYFS_ETC_DEVICE} {OVERLAYFS_ETC_MOUNT_POINT} +if mount -n -t {OVERLAYFS_ETC_FSTYPE} \ + -o {OVERLAYFS_ETC_MOUNT_OPTIONS} \ + {OVERLAYFS_ETC_DEVICE} {OVERLAYFS_ETC_MOUNT_POINT} then mkdir -p {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper mkdir -p {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/work - mount -n -t overlay -o upperdir={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper,lowerdir=/etc,workdir={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/work {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper /etc || echo "PREINIT: Mounting etc-overlay failed!" + mount -n -t overlay \ + -o upperdir={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper \ + -o lowerdir=/etc \ + -o workdir={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/work \ + {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper /etc || \ + echo "PREINIT: Mounting etc-overlay failed!" else echo "PREINIT: Mounting failed!" fi