From patchwork Fri Sep 6 09:39:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kumar X-Patchwork-Id: 3786 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 06 Sep 2024 11:39:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f55.google.com (mail-pj1-f55.google.com [209.85.216.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4869diqw014202 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 6 Sep 2024 11:39:45 +0200 Received: by mail-pj1-f55.google.com with SMTP id 98e67ed59e1d1-2d404dffd54sf2330208a91.1 for ; Fri, 06 Sep 2024 02:39:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725615579; cv=pass; d=google.com; s=arc-20240605; b=Jfcd/so+L7ALMKi7xnie4wpFOTaW1aT02kFUTrgy7IoCjszbEsDFwqKteQIBzyStGu XoH/ynVa+f3ffavxjsgHSYxUfPQKisRQJ09ukeC8xnfjsl3flWND3fE7OP4NNiUBCZQA 3uIvyrevJzptRwEjos9z8MA7EpNGSvCG+BvrJpzLycoY1/BcFrEVXD9pW/OC7TW1HJZE Xr6L+QkM/3ZUyuBEKbxknd+3swc7tWSFbmqHJSwLe3R99e/88sAhzkQVbqjApGJk7c/N zJcfUF+A+tyWiSE5caUp78zfLfp4FyeQmcGqVXlXpxzpT3ejDedcOsrQ9ibDsWuw9dEm 30Rw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=oF4TjrZO2c7bPeLosDpH3ER7XI6D7aJS22Wy55E+5DY=; fh=N0zhhyfxjyJUgXagqvRFxE9vB/4AGhbLzSh0dRfn8Ho=; b=emupYFbm+12IwV/nPpHlVWDVyAklJxYcKBHal48brnDxZJkkMpMPui7CxrJIMj5hnX WtlWC1YoZ0TmTw82o/uHNPlAiDRGYkFkB5Y4QE+b7RZP48+CNw6yKFu9xJACg3qWegbe yRca8MZM/pGDv38VcmY6f1E0UCUrqggCHr2UqrBpCi1qd9FdOLaGOpOZ/fbNpMxgxFsy LIXg+k7Rh+MHxkT0jBFnBvVG0v0ff2Jx7C/y9pGW021iy2IRv4xzR9rVLlBKf1gj1SOV fT15llrPGKs7DvER2EoyUgucFRo1hDa5W3g0o88n2Hp3G7qu6TQei4ZMRKrDgeZl5I9Q XTMQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eRwcmeVC; spf=pass (google.com: domain of fm-1325885-202409060939346a3bf204826a968d03-7affvx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1325885-202409060939346a3bf204826a968d03-7afFvx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1725615579; x=1726220379; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=oF4TjrZO2c7bPeLosDpH3ER7XI6D7aJS22Wy55E+5DY=; b=nxOhB1tAZ7CuAIcByMmFXChAg8xJUpbZM4LJAga/fQaDjjSftq2Np+LyY+WBl5MZ/q b7pm4GpFZqc4JZIuQYQ0vuUjVokicBAhhDjWqHNO1UheP/DUdAOlTojqF/Hk1nH4ahV4 bR5jPOeI5YzgEvy/ZLE5G2lqr8bhzq+FROaPVylrosRvYFk66BVYrVg8pprFq+bCa/mE Gsu4nt+AjdTWmCINMX9IZAzWyVuk/RDIySAK5IARxpR0nScTtz3wYH1aJnkJTgo8ynmf HVA5e5a5FmH/NvJuj0tfNHHZGHT+RhnpFMfDh0tTPh5MF4m2mzHrR4S0TVk23sS0W9Wc mu/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725615579; x=1726220379; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oF4TjrZO2c7bPeLosDpH3ER7XI6D7aJS22Wy55E+5DY=; b=Oy5BsRi0RWhC1706at7J/pBfZdirGUGG32eEOTfh/GELGb91UJ+7rn1Hk6YYLU8hQN rp5fFuo0MZ0WqSoAfb9Lb/0m73VHm++4q138shRsbq7s4TSVNc2ebeW1IpmCaybctAyC Y3B+hFizM/LtjuvqCge+l7ilLLS4ho2Yh8lMEOIyMXctsdUsxOpqYRHTf5yP4yZNK0K0 oY/Dqvdv93dyyHQzBUTvklVjj5zqoWif6QfvUVf4nR2ZNo3M5HDy+g4u/Swf3VCn5J7V 7S5DlQP2Ah2bqgLCL/LXPLlhudtAi1eZZ3k9ExPMhLr9yBx17Ji1craRmPpipLbDYdKW lnRQ== X-Forwarded-Encrypted: i=2; AJvYcCWEgHsyIgSmUx0DAwfJ7VtnFXmqZQX+ewUhJdXvCDWq4q0hs3mr4MTTEPWuh0KTJW2DAZ+3iOM=@isar-build.org X-Gm-Message-State: AOJu0YxxZW3lgmdZToi14Hroe7tgKQNFGW23cWGFTS4iWd8MoGWyuSKH MeJ5QB0ZPDuIQiLgUmocXZFgssH61P0WK9liW66ITkHhVMSGWOkh X-Google-Smtp-Source: AGHT+IErzRYCPn1DZOFw53RNE04dydMQ81jhIHMwwcA8HUHBNPRuY3z9lnhyUSlrA6woZZ7CTeyCyA== X-Received: by 2002:a17:90b:4a89:b0:2d3:df93:1e5f with SMTP id 98e67ed59e1d1-2dad4dddd89mr2224495a91.6.1725615578506; Fri, 06 Sep 2024 02:39:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:d503:b0:2ca:d1dc:4a26 with SMTP id 98e67ed59e1d1-2dad284ce5els465412a91.0.-pod-prod-06-us; Fri, 06 Sep 2024 02:39:37 -0700 (PDT) X-Received: by 2002:a17:90a:a893:b0:2d8:6e9c:a765 with SMTP id 98e67ed59e1d1-2dad4b8da29mr2619374a91.0.1725615577221; Fri, 06 Sep 2024 02:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725615577; cv=none; d=google.com; s=arc-20240605; b=KL2aM7iOUibZB411kRV6eCvo0yXSIVrnbJHBf4s2OXJZ3FkyxM0k8reU45AAhYP9PL WaDLXFmJFgsEf1GsP9gva8eFkN8EUMXem/ukNwsfPeWL/XSZbxj2JZe2vBukCD/7L6A4 vnerfDPhkDKkeOll/h2JVNBlxffEPlEhcKbAr1rB8caHTDsId8Y8GiOoRlWVsFERCjEX VfF9LbPUgvs/pOE9jvA8f4EaGndD+vUpBUlSl2vO4pcrCroxbrfiKWCgkhKJMSv5s7S7 tF+rukmF3MjGyAkMZpWjtCDjX9MPtXvsIOEraG5ZQblz+5sDOlraRRVK9SnJ+T5o1T9g whVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=sWvAxux8FEnXYt4+qiKh7z6DwtvQuICM0zD611V9inw=; fh=dwnf3PiLoNuxEmlEQqfoWYSFcsr4isZMqOMz5uUNloE=; b=IJK9kxyp3wF5mpQF8PD1mjruC4xV55Sa53X20snZxb92FmplVqCbDV9ZqCY7ln5UCr e+Jhu/EDSTXO6/QS3bTdBBFJuWyZ+sPHJfL81x62lz+wY7h/t3XdDAyzLaaRl9IXXYfp Y8G+Vwd8ybUTOwdPFWou9A77DD0EU06WOqMkh39bUjfllvCl6/bro5yxOHfh4oI9aM6G iuuyISO/o2+yYBtVmG/u+7DNO7X5sADtXr2gJIHjdjxv9IYWKn0Tr0lDTyPf/IyLZiZs vNqewjvyeLMXKfkt/YfAVaaRm2D/f0L+ccE1JOhTfnbgdX0iif2WOf2vqUD2/xXvwiwZ 9sSQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eRwcmeVC; spf=pass (google.com: domain of fm-1325885-202409060939346a3bf204826a968d03-7affvx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1325885-202409060939346a3bf204826a968d03-7afFvx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2dab6e52153si265308a91.1.2024.09.06.02.39.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Sep 2024 02:39:36 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1325885-202409060939346a3bf204826a968d03-7affvx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202409060939346a3bf204826a968d03 for ; Fri, 06 Sep 2024 11:39:34 +0200 X-Patchwork-Original-From: "'Rakesh Kumar' via isar-users" From: Rakesh Kumar To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, cedric.hombourger@siemens.com, Rakesh Kumar Subject: [PATCH] initramfs-fsck-hook: bump version and improve error handling Date: Fri, 6 Sep 2024 15:09:27 +0530 Message-Id: <20240906093927.1814962-1-kumar.rakesh@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1325885:519-21489:flowmailer X-Original-Sender: kumar.rakesh@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eRwcmeVC; spf=pass (google.com: domain of fm-1325885-202409060939346a3bf204826a968d03-7affvx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1325885-202409060939346a3bf204826a968d03-7afFvx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Rakesh Kumar Reply-To: Rakesh Kumar Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-2.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_PSBL,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= * Bump initramfs-fsck-hook version from 0.2 to 0.3. * Renamed the package from initramfs-fsck-hook-ext4 to initramfs-fsck-ext4 for better readability. * Improved error handling in the hook script by introducing the hook_error() function to handle failures during copy_exec calls. * Corrected the path for fsck from /sbin/fsck to /usr/sbin/fsck to reflect the correct location of the binary. The script now provides clear error messages and exits on failure, preventing silent errors during the initramfs setup. Signed-off-by: Rakesh Kumar --- ...sck.ext4.hook => initramfs-fsck-ext4.hook} | 21 +++++++------------ ....triggers => initramfs-fsck-ext4.triggers} | 0 .../initramfs-fsck-ext4_0.3.bb | 19 +++++++++++++++++ .../initramfs-fsck-hook-ext4_0.2.bb | 18 ---------------- 4 files changed, 26 insertions(+), 32 deletions(-) rename meta/recipes-support/initramfs-fsck-hook/files/{initramfs.fsck.ext4.hook => initramfs-fsck-ext4.hook} (51%) rename meta/recipes-support/initramfs-fsck-hook/files/{initramfs-fsck-hook-ext4.triggers => initramfs-fsck-ext4.triggers} (100%) create mode 100644 meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-ext4_0.3.bb delete mode 100644 meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb diff --git a/meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook b/meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-ext4.hook similarity index 51% rename from meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook rename to meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-ext4.hook index 259b73b4..e81f06f9 100644 --- a/meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook +++ b/meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-ext4.hook @@ -5,8 +5,6 @@ #!/bin/sh -set -e - PREREQ="" prereqs() @@ -24,16 +22,11 @@ esac . /usr/share/initramfs-tools/scripts/functions . /usr/share/initramfs-tools/hook-functions -if [ ! -x /sbin/fsck ]; then - echo "Warning: couldn't find /sbin/fsck!" - exit 0 -fi - -copy_exec /sbin/fsck -copy_exec /sbin/logsave +hook_error() { + echo "(ERROR): $1" >&2 + exit 1 +} -if prog="$(command -v fsck.ext4)"; then - copy_exec "$prog" -else - echo "Warning: /sbin/fsck.ext4 doesn't exist, can't install to initramfs, ignoring." -fi +copy_exec /usr/sbin/fsck || hook_error "Unable to copy /usr/sbin/fsck" +copy_exec /usr/sbin/logsave || hook_error "Unable to copy /usr/sbin/logsave" +copy_exec /usr/sbin/fsck.ext4 || hook_error "Unable to copy /usr/sbin/fsck.ext4" diff --git a/meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers b/meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-ext4.triggers similarity index 100% rename from meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers rename to meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-ext4.triggers diff --git a/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-ext4_0.3.bb b/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-ext4_0.3.bb new file mode 100644 index 00000000..c2136f9d --- /dev/null +++ b/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-ext4_0.3.bb @@ -0,0 +1,19 @@ +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + + +DESCRIPTION = "Recipe to add fsck hook to the initramfs" + +DEBIAN_DEPENDS = "e2fsprogs,initramfs-tools" + +inherit dpkg-raw +SRC_URI = "file://${PN}.triggers \ + file://${PN}.hook \ + " +do_install[cleandirs] += "${D}/etc/initramfs-tools/hooks" + +do_install() { + install -m 0755 ${WORKDIR}/${PN}.hook ${D}/etc/initramfs-tools/hooks/ +} diff --git a/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb b/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb deleted file mode 100644 index 9860dbc8..00000000 --- a/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - - -DESCRIPTION = "Recipe to add fsck hook to the initramfs" - -inherit dpkg-raw -SRC_URI = "file://initramfs-fsck-hook-ext4.triggers \ - file://initramfs.fsck.ext4.hook \ - " - - -do_install() { - install -m 0755 -d ${D}/etc/initramfs-tools/hooks - install -m 0740 ${WORKDIR}/initramfs.fsck.ext4.hook ${D}/etc/initramfs-tools/hooks/fsck.ext4.hook -}