From patchwork Sat Sep 7 16:51:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kumar X-Patchwork-Id: 3815 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 07 Sep 2024 18:51:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pg1-f183.google.com (mail-pg1-f183.google.com [209.85.215.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 487Gpfs1021003 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 7 Sep 2024 18:51:42 +0200 Received: by mail-pg1-f183.google.com with SMTP id 41be03b00d2f7-70ac9630e3asf2975260a12.1 for ; Sat, 07 Sep 2024 09:51:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725727896; cv=pass; d=google.com; s=arc-20240605; b=MrWKi+hWiQCLtgfl8lbo+5ol05nJdYVieaT8iAbkNxQZ3ESiwPfZRC3n8lPQx1i6hy vjs944yWKEi/P5j0SqUeVGCRvECXneUMTLylsEqYENoXywTaC1zPhotHx06CqVmSnItp ykZHYlLF3tgfE/bs7Gl60k7C5Np689Zy9HO+8rX82ELcQJHdzbA4ZTa7hck7kD4H0K6x E7AGcUfluEUQsPMTyEmUzIjM9oWHTPbuBZFOa48tyLo8zmyC92gZAoRoJiDovDrw9BNA I8U++4M24lg0q9VGoeWTZA7+/jlCBqtWLpPTZUD4MHl6pvfTd5b6imMKz17xw9ARkPRr NMCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vG4Z6qrZNmQKmo1f6sA6UVV46iF/2/D/ar/YBaLBZ1c=; fh=EbX4TI7uaom/FCyy5wlGEAqd8l1vXhGhLv32Ij4DcSg=; b=leU6KU/IaJrfkVOHx1+9lhv02qhrT2/b9pls4nYerw1J5AjXWmf8YzJYGKaeD7FAch i5DF2nS4zr2zJqi7hkJCsgwm2RIuC0pe/eC4D62e7KBUwuvS3zi3pyH1vjOvcN9TTIZs Sf+ilGPGYWqFBO/HbQ+IjstKjxJIyxyKGwardtZo6eBf4oamEOKEiV713mc9dL8K8kOk AVTOwBsHmAYay/ErE8XlSBPEbOu1jYrAGm0iZFe6ZBblOgSvlf56oSGmYOMW2TpBvnv4 YFs8BDngubAgRevBTYFg760JqcQ/+qi4g1wgumkcAXtUDr19BKaNWT8jAfUAEwmWXJkn wbgw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="f05/QlXQ"; spf=pass (google.com: domain of fm-1325885-20240907165132913a68b4bf7364276b-rdop_t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1325885-20240907165132913a68b4bf7364276b-RDOP_T@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=1725727896; x=1726332696; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=vG4Z6qrZNmQKmo1f6sA6UVV46iF/2/D/ar/YBaLBZ1c=; b=WOsJK9g84puIziRNj5tW+OVybUaguwbqsRJ+gq7FQBi8s/cTO6AnFG8j4s/1jfJyAK QDdf7fY6zzy1ZK/7qa4IhFdiooB/9PEnlqQdTUTQXvbfx6sxS44Ad0yt76qFCX2Og/Od NYWlzpuMAVupSDN6p8ylIzvrI+/IkKV9ikmoXLNLLnsteOaL9cPNCeoX/cfVcZXPbeab 4TtkKH+9gZV7Kghh152tlJ2iGwwnxb6JU0NSOnhPUHu+FGXtZ1kpBBhr14NWsRSTC+of +fL4YCbH3nKeuE6emhC0fjWYkRvtH4XJnDSjy325n4a7yWQuteavvFmCqJqYm4Mr701a pMQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725727896; x=1726332696; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vG4Z6qrZNmQKmo1f6sA6UVV46iF/2/D/ar/YBaLBZ1c=; b=PJ0knKmmSmDCcBwnkCJEenZ5uUHYZrDKuuJLDhIke/ZgQ9ATLw6UPesySj5kMxV7UF o2kDvUrE2/+piw2ZVNwseIkx1UT0TX89ikxxBaTpgUKPU7sGN7PxstSpsNZ3qTAPBOky IbzjDrSCHAE7tpyhkeWEXB+Lw69yVGfnjD9BqCBjtu78lHlUydDaS5K3WCkt1exOag7j QJqc1FKZHaF1HAHAcPvIc1JFU5zSXTzOHYIbZ81LQ6mq/xZqq2JQjYpULGoLBIfpnJym M2J8JWrjeNFrpGBeE7/cutRkNFy8pDUFGFPXMmDBvfeCgiX4j26BbjBLF5e9gG59wWY1 35Vw== X-Forwarded-Encrypted: i=2; AJvYcCUfesx8BhqrQc484nOOTYHHbTBSubMcIG2+Esr9I0dkheW89AXIX4uPihCwxi0cAbpHgmzXQpA=@isar-build.org X-Gm-Message-State: AOJu0YxJDNRAChkibcIumHLXiRqJAEhe2ELWQHsnQgb9LwmbjGl8IhmI LIJ+ycvFDNP0MuQUaIPZe+U+nHIpGhVxBiBELYgktyhqhF4Z6eMM X-Google-Smtp-Source: AGHT+IFeD3Kzd7difBKxUf+h8+PvKIlrVqnIaMQGyUc1t5d4CnYZTbQHo+g0/F/3JhZWy53lfapmhg== X-Received: by 2002:a05:6a20:2d24:b0:1c8:fdc7:8813 with SMTP id adf61e73a8af0-1cf2a046ee2mr3231259637.23.1725727895800; Sat, 07 Sep 2024 09:51:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:e80f:b0:206:cbad:e63f with SMTP id d9443c01a7336-206ee39de51ls12079105ad.0.-pod-prod-02-us; Sat, 07 Sep 2024 09:51:34 -0700 (PDT) X-Received: by 2002:a17:90b:3e8b:b0:2d3:cd22:e66f with SMTP id 98e67ed59e1d1-2dad4f05ff7mr6144723a91.9.1725727894640; Sat, 07 Sep 2024 09:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725727894; cv=none; d=google.com; s=arc-20240605; b=GvUuUHsWFqktf9S2lnjBKZloTYn9XXms3j04SphPbSqMGzUykMgQfSHftCcZimh8zz D47VPLf3K79d9A7h/5o4faVb4bP9epgm65A1BVU7iXRR5JSUdQUsvYqu/8FIs4IcBzvR n4gEcoqGwfElc0YmePS3HY3onQ1fn4ZgxP4yMPrwm+cnZKRdmENyApjMz0E2HSVE5IAv P9nCzzgpi14nfoKuBPzeGAEFyGU0TzmRrg2pK8dN5VrL/iH96LweQEHkVu2Iki9mXVU+ jd2PJvCL1F/mdKVBcojmIA8xDmKpDdwTG2S7zwrK1aNti5uprK0+Ubgdx7TDqbHP6af2 YzOw== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=NsWMk0SqQuEXpKWzDvYFdF7OTm2onW06aEpy047QaOA=; fh=dwnf3PiLoNuxEmlEQqfoWYSFcsr4isZMqOMz5uUNloE=; b=JuEL0uRddaDJeRXh90fCjrw7aKrWoBvDnC0lzn1RCy0RICxEVADOhgJEJqW3QpRIaC 7i3z2dlbcBd/g8qdTiwugP54o1MfrlitZlFKsfgrLzwHNhZiloHb/lcF78V1QXW2JasV abZaZCA7GyJCNofqf8gn4JqE+tIQo/I5kadlX3IZAl9/4KHq7iGUgby3jPEYf8psFP8X +kuD2ur19/7wJLPg4A1dXGuDMHOR3LwfPPYkWsQTUeuGX95rr6CsuxYFKFfMKUKU0KHL PXQXUkU1xk0b+Hicwvgnv+5NupwvV1CvoPugCYj6wT3TlOqfDELBj3MXsQ6AHczu5OtJ ouBA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="f05/QlXQ"; spf=pass (google.com: domain of fm-1325885-20240907165132913a68b4bf7364276b-rdop_t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1325885-20240907165132913a68b4bf7364276b-RDOP_T@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-2db03be21fbsi44348a91.1.2024.09.07.09.51.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Sep 2024 09:51:34 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1325885-20240907165132913a68b4bf7364276b-rdop_t@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 20240907165132913a68b4bf7364276b for ; Sat, 07 Sep 2024 18:51:32 +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 2/2] initramfs-fsck-hook: improve error handling and correct fsck path Date: Sat, 7 Sep 2024 22:21:04 +0530 Message-Id: <20240907165104.1825446-2-kumar.rakesh@siemens.com> In-Reply-To: <20240907165104.1825446-1-kumar.rakesh@siemens.com> References: <20240907165104.1825446-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="f05/QlXQ"; spf=pass (google.com: domain of fm-1325885-20240907165132913a68b4bf7364276b-rdop_t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1325885-20240907165132913a68b4bf7364276b-RDOP_T@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=-4.9 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_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?= * Used hook_error() function to improve error handling during copy_exec calls in the initramfs hook script. * Corrected the path for fsck from /sbin/fsck to /usr/sbin/fsck. Signed-off-by: Rakesh Kumar --- .../files/initramfs-fsck-ext4.hook | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) 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 index 259b73b4..4762c805 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 /sbin/fsck || hook_error "Unable to copy /usr/sbin/fsck" +copy_exec /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"