From patchwork Wed May 29 12:09:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3584 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 29 May 2024 14:09:40 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f61.google.com (mail-ej1-f61.google.com [209.85.218.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44TC9eba010637 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 May 2024 14:09:40 +0200 Received: by mail-ej1-f61.google.com with SMTP id a640c23a62f3a-a65ba704ccdsf2740766b.3 for ; Wed, 29 May 2024 05:09:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716984574; cv=pass; d=google.com; s=arc-20160816; b=T+V/6JNoANN43TfUGGHDlVIEYUHL1feSR5O+7/Xm+YxN3UE3Ro4tB5IaOb8cULpV3n cm8Sv7auV6dGJuSfarp/BYIRvhNKjmmhoGHu/NMDJb7Ld9qa+DomPs4eZWZahmTKkle7 puJrffyZRX1hM1Hm3UXXuUoww/uYh8Ky9bZm0DxdGrv5nq5Ej6ycvAYEUdkEhXqVbx43 DRz7R0hruMcDxYLitOu9rf7idcrHwVsF45lhVDOYX8leGXd1KnBJGrS5QAM0lfs1VCor zgAO/bs2lybrCepagF+HFel62OwEnU1HaNee5dnePpO9UbxEADLB1puDRvO3C8vTeICE MTTw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=ps1utpTls4GtZsBhp+ZUj7b3tfV4GKc7f3M8EW8A1W0=; fh=Ulr56EY0O3aGuYOIsNvpBurTwXJTR6ZmGxLmMtnmTWE=; b=JU435gTvjaLNQ7vL/i63AodjZnqrmTdqlysZHVzs3S9CS/qRDkPXJ/PDolHFFwcqsZ bo8OVihhiee6U6ZGG4+hqf+5mcVE4BuFYieoGiyEwgDu28j4/EAwJn+Nnixc7+vhS2Wh LDQ0gYbT3Sb6CsspAjYmEUDhSPsiqOvf6SSOVvJrE9muNtJ+6OyuZd+fB9BWkTpjiqxO /j2yNpkBb7S6yDDp6R+sMB3j4f8uQ1loZGooLpLJ1JP1aFff7AdGYxsTBGFtPkkWDw2F DofO5+MGUa5I8dAXEFPvU6yyaA7txjkxWoR82TjK+7eoQ8E8rWgKV6p1WQ8kOu1RV+em 82Yw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1716984574; x=1717589374; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=ps1utpTls4GtZsBhp+ZUj7b3tfV4GKc7f3M8EW8A1W0=; b=NWfqcFaNvHzIIk83bhFWr+MQwqgvyH/U9zVyS205w/itiAAoOprCw1bEvbDbp11II9 y3DK9TEoSJw2KXDCj27LtMsTHemh5y6dmSRACAjr4B4abm45/OYc/rTakluS3VUcUauH NzoL8cQjhwrQ7MQWvYG8K0ddMaxV5Fl4PfqK0d5QIiLlOvbNjHacTvdtlCSPMqxqKP5x H3/eqnUMPwg2tB0kIx2RHSU6vi/NcgBdP7NiYbrsxBO/+yJ9fN0VZnlKbGCriaM6npDE rHo/Sute8KU/H2H19zFec0HIG+YcmbcSxunW8/z2oTE6HoNhrSIreYr/ht+IbswBG44J 6Abw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716984574; x=1717589374; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=ps1utpTls4GtZsBhp+ZUj7b3tfV4GKc7f3M8EW8A1W0=; b=L3xEoIWfP0ggafyaSxnVHq4sqalpNnD5mfd/ZYjHssNCY0/uhlpNY5hXxKO+t1VP6u QuXtHbOjCWa+wAoyh95zOfVTI5U6WW3nmzVfomxWFkcYrJ4VAROThA9QOnfPA9Ydu4r7 GIBsKVDNb+jFbzYigEAgYBOxZxEdLj8SzdVPMFUU+hXn/Zr9OBwchQPd2PgJtqoLkBrH +9/zmL1Bc4KUkgQjVOjt2Pjy8PpYRtGHqmY0d0ckzP6t9QXH8iMZDOdxEOhh0Q2O2nxX 8gGeO4OLzdmN/Nt6Qs5jT64X9Hfv9lKcNgB2hS54kH/nu3fQ6T+FnuRNQI1aUOLDe/5T 18Ng== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWk9A/fDfQJwWdevM9saHEmhaXNkStZRRRQZAFD8C/eq1NU07pZschQ7Vc04Wfg3YZt2I2CcrqkX8S1HueVmZQP4Npq5cg= X-Gm-Message-State: AOJu0YxIzrFe/Qly6KFcP+SSfd4CO6Sq73HkwNhpt2uXThuJHPd6r0mi qEF7zT00tdggDJNF40QnuW8ZIVABxWdKrSORorAfxIetKGLBOEG8 X-Google-Smtp-Source: AGHT+IHdvzvJCfWUP9kLCA6mFdXnER4DIHoqLXoQd0FR74x0kJi1aQ0Xxh0vljUsyVBteEhPcYqbkA== X-Received: by 2002:a50:9ec5:0:b0:578:6959:9d4b with SMTP id 4fb4d7f45d1cf-57869599edamr7625251a12.0.1716984573874; Wed, 29 May 2024 05:09:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:3215:b0:572:6ddc:bb0f with SMTP id 4fb4d7f45d1cf-5785681f086ls516156a12.1.-pod-prod-03-eu; Wed, 29 May 2024 05:09:32 -0700 (PDT) X-Received: by 2002:a17:906:3393:b0:a5c:d67a:1e17 with SMTP id a640c23a62f3a-a6264193035mr1004699066b.15.1716984571832; Wed, 29 May 2024 05:09:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716984571; cv=none; d=google.com; s=arc-20160816; b=EKrV8QjaM9t1X8dFy9latTZ0mlaGpZFZUQMIDzkm202/4FYqAvz1lXp3oNrn7jMNFh RVsA3BIQrMn8JkbvP3D7ZrKaqSBJb4dyPs2LGxvWtnq527eBbKgK8jhBQemod8PGwUF3 bLaGX/P0GNaGDiD/wrF1fgqneDsY+3BSOe0Re6fzsODAAdCOBjmiC1jbv6tz9/SDsR27 +HNKlS+Zyw+m+nIsUFskYEQQToLKMRtUze8DkNLmfj5m726+Fzxzv/E3IgMH7qku47dI pcSIQGa8BGZXSNm83paIGRsyiczx5eFfQh8lxGrb0W++SaDsY0t7lGfnEEfAwyPFxTf8 Ry3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=9OiPM1DUsiGQ/1sBQ2+yLK+x+tUcWrehHhZdqBvVKeg=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=h9IjPzyPL+KyUCvrUAowFkKWYrWQtTdtSyVb/OzMRoETXOwCQzdNYVLQyujoO6CawC Ou+LrzbiddcxXXdLwVY3CJGabkwS2mx+AtEvJJfNn5hOyO/xw5TP2+MvwNF9IYVDczLf Lgns6n3hyxWWQgBIc1KmyxcJjOLFIbcsDREjExKrVbgQ+z6esSIJXnieCW6MleQsjhxl utstVk7Ao3BJBX1HOqRWe21SAEdhAJ0VodHxrwKWSZ4dxwMhY2sVjkJHlb5YRYL5GMnt B/1C2M5B4zpuK9VuGXLRQhDXAHy/39o1dHAfTamCcvigPbD2dxbFJi6w5/vkbbhGZn1Y ZtWg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a640c23a62f3a-a65a01f2e68si1194066b.2.2024.05.29.05.09.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2024 05:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.promwad.com (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 44TC9UIc010623 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 May 2024 14:09:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] expand-on-first-boot: Fix "label: gpt" detection Date: Wed, 29 May 2024 15:09:22 +0300 Message-ID: <20240529120924.14501-1-ubely@ilbers.de> X-Mailer: git-send-email 2.44.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Commit 991d2e9 introduced the issue when the whole script early exits (due to "set -x") in case grep doesn't find the pattern and produces an error code. In this case last partition remains non-expanded. Fix this by masking error with "echo 0". Signed-off-by: Uladzimir Bely --- .../expand-on-first-boot/files/expand-last-partition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh index 0cb2ee21..8ab0f8f0 100755 --- a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh +++ b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh @@ -41,7 +41,7 @@ if [ "$DISK_SIZE" -lt "$MINIMAL_SIZE" ]; then exit 0 fi -IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" && echo 1)" +IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" && echo 1 || echo 0)" if [ "$IS_GPT" = "1" ]; then dd if="${BOOT_DEV}" of=/dev/shm/__mbr__.bak count=1 fi