From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7374866765664223232 X-Forwarded-Encrypted: i=2; AJvYcCVvT5pHGedOT1kG0z0c6j1Pkl3gQldXTaGLweV1B3zpILFlejevWxLRD9lHbLGIi5wlzvq7TwoV3yMByhpecMuWWFRQxeH18qNgZgg= X-Received: by 2002:a50:cd9a:0:b0:57a:212a:a21b with SMTP id 4fb4d7f45d1cf-57a363820d3mr737511a12.7.1717138104640; Thu, 30 May 2024 23:48:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:3226:b0:578:2803:753f with SMTP id 4fb4d7f45d1cf-57a1726dc3fls417414a12.2.-pod-prod-04-eu; Thu, 30 May 2024 23:48:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3xor7Sc4ZFwHpUorCslefMaOWpD/dXvAfrq3XHi+Zv/fDtypS4EMuz4tsGc2o5FQvhZBYTnrZuWtv8wouwqWONLciqTLDE6F4M5Y= X-Google-Smtp-Source: AGHT+IGqCOW2F6qlaZT9vNc66/6SUkT+X62ueEUbYNDt7CNScaibhH5WY9kO67jvtn6Jhj89BWvI X-Received: by 2002:a17:906:408a:b0:a68:43a6:fbdf with SMTP id a640c23a62f3a-a6843a6febfmr49390366b.49.1717138102210; Thu, 30 May 2024 23:48:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717138102; cv=none; d=google.com; s=arc-20160816; b=ZDoG1g00/6N2AOzGOIEKrvM68kVFncdevGnsaJfMI8WLPeQYLTkGHrIJyeqv46KxZ2 0UlrWeEBxEna1tU8kdNJ8Y0biLLZUE6Il3Bl58XU9WxLoZTE6PdECriq+KL9LUxxqg/w VvnpBEYOhCKwZk7xIOlaCLKCH64Kbf33jwgT4fo4Yvw1h8vvFGBWcowjLj8rLp6XSOUA Hh9AWuT5k7oYecriCYWWCBKz01EvCY44qGP6cFxPtPJZfPd0Xu9B+JT/s0vXeKzGZlhF Jn3R8MvXlnkkYl5pOn7lCkaNhhvYBF0qtQMDvIkeEnCCCv8kwxgkNnVyuPW5fl25nZx9 FmGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=J9ottIkygHnixLxh2tH+uGKKe3KfGbeF5tkSf1cuI3k=; fh=IxbeHM4vWxalf1XNf2rnGcQL+r1v0Lr0C6ICsGNNkYw=; b=zm5swUC8fMO0gcKp6rm70s/UKok5SCFpyZHc11uA+0HJnkuzpeZY7n7wmEFmCVJC29 pvBMTZUZ3b0iG8i6XFxsEdZGwxXgkBqeeK5BBijKb708UK/TmnuOWBeRHOGtdB1F23kX z/GZJtcQ3xhGMHOz0Vlb2JYKp1/VhahZhg5W5X2DhZGP5cBFjePqXOnIHtFsGuEtmr0w mZO2o8nj4Udi0vflpDCx3F1zUkkg3Zs4bOr3iMcuvM4Pknz4lUVdw3Hvq8KF/pDoOrDR qNNTDbL+kh/7xbxpaFrJ3d8+wgeGRut0JQoFN1sbcim8xGBFNkyEimwZ0lF/Xp0LKZub GoaQ==; 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-a67e1c22a5fsi2885466b.0.2024.05.30.23.48.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 May 2024 23:48:22 -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 [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 44V6mJmR021327 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 May 2024 08:48:21 +0200 Message-ID: Subject: Re: [PATCH] expand-on-first-boot: Fix after failing on every error From: Uladzimir Bely To: Jan Kiszka , isar-users Date: Fri, 31 May 2024 09:48:19 +0300 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.2 (by Flathub.org) MIME-Version: 1.0 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: R/Dnl0EVE62T On Thu, 2024-05-30 at 20:49 +0200, 'Jan Kiszka' via isar-users wrote: > From: Jan Kiszka >=20 > As we bail out on every failing command, the test of GPT causes a > premature script end if there is now GPT in the game. >=20 > Fixes: 991d2e903930 ("expand-on-first-boot: Preserve MBR on expansion > of GPT disks") > Signed-off-by: Jan Kiszka > --- > =C2=A0.../expand-on-first-boot/files/expand-last-partition.sh=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 2 > +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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..7660bf44 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 > =C2=A0 exit 0 > =C2=A0fi > =C2=A0 > -IS_GPT=3D"$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" > && echo 1)" > +IS_GPT=3D"$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" > && echo 1 || true)" > =C2=A0if [ "$IS_GPT" =3D "1" ]; then > =C2=A0 dd if=3D"${BOOT_DEV}" of=3D/dev/shm/__mbr__.bak count=3D1 > =C2=A0fi > --=20 > 2.43.0 >=20 Hello. Sent the same a day ago (faced the issue on NanoPi Neo): https://groups.google.com/g/isar-users/c/D_sCls1hwj0 --=20 Best regards, Uladzimir.