From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7374392591763111936 X-Received: by 2002:a50:8754:0:b0:578:5ace:1c96 with SMTP id 4fb4d7f45d1cf-5785ace1f85mr9610312a12.36.1716984573992; 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-Google-Smtp-Source: AGHT+IH+RpajuLN9K9jolQTG/2upj3C/my6ydu/wiCiRpOuFWX8y+D3qWUB+qiA4LBDtMsXpsqOV 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: r20DuyH1OIMR 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 -- 2.44.1