From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4561A90665; Mon, 10 Oct 2022 23:33:11 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 6788C902FC; Mon, 10 Oct 2022 23:32:39 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 011DB90100 for ; Mon, 10 Oct 2022 23:32:14 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 6CC635C01C2 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1665444730; x=1665531130; bh=dE sCs40ccHQtTW/oqxruspfSQvyDicViebDpvdZgpms=; b=aOYJGok33pL44+Suem RnljVPliFeguC5HkzFp/w3MZP1OgU6lfkPr/oEYx48lcHSVIuM0LPe4iELsrMp8t HvsZ04E7nDQHNxMi9lQdimHSj+B6BAO+xqp50CEe3SovDM7GqqDwql/QNYJyBO1v rE7Cd/bF52dKafOx1UaBwhKTRPnIvsG6I4IUtijQOd/7Qw9IoVWTlBUAPL+YttCh Z59tJvTd6XLpavZjRajOGLXADcKDvhbOaWi7vadF9szGMPBS7N27KAdZ8jmBYKx9 5goEaYWgZBOX7oXcEG9cOgrXM+gWZiiEsuuweKgt/fPeQIGF9qmhoV5Uw/j8+qZO InMQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1665444730; x=1665531130; bh=dEsCs40ccHQtT W/oqxruspfSQvyDicViebDpvdZgpms=; b=WAn89+J1H1ERJNfkIrCIITVUlWyuh V2krJNNTrJlGkBAd3A1NxPc9ckHi/8Sk9j+mhr8oq1AzZ11gnZQ3538sRqBjmdMg 70Q3s4LfxqA7l1MSULiJJQlAsww+gNt5hLpTgdca2gRiXcCrA87qiR7LaG3lujHg +sgTwA3xBgjRln/eMtvSIOajEK7Wh2QNFK/sBhF3WE1stVrV7q3ahasSyUjus7Zs E0PQ5fflkQNQLb8linxQJQo6gtsXy8lYrkWVuA3twPlI5miAd91f2fpSVwiZ5m8i 0Nzm/lRrSNjb35vjfLj1CULJsbwFYFKX3rrbXg8xDWo3Ek2jpa7Qjbc9A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 83625BC7; Mon, 10 Oct 2022 23:32:07 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v2 2/6] scripts/make-gpt.sh: add support for labels Date: Mon, 10 Oct 2022 23:29:05 +0000 Message-Id: <20221010232909.1953738-26-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: T36VNUYPOJO56DLFD2EKWBCIPLEALH7V X-Message-ID-Hash: T36VNUYPOJO56DLFD2EKWBCIPLEALH7V X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The label parameter is placed after the UUID one, because it doesn't always make sense to specify a label, but specifying a UUID should really be mandatory to ensure reproducible builds. Signed-off-by: Alyssa Ross --- scripts/make-gpt.sh | 4 ++-- scripts/sfdisk-field.awk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/make-gpt.sh b/scripts/make-gpt.sh index 56076d3..e6c3b37 100755 --- a/scripts/make-gpt.sh +++ b/scripts/make-gpt.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross # SPDX-License-Identifier: EUPL-1.2+ # -# usage: make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID]... +# usage: make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID[:PARTLABEL]]... ONE_MiB=1048576 TWO_MiB=2097152 @@ -26,7 +26,7 @@ fillPartition() { dd if="$3" of="$1" seek="$start" count="$size" conv=notrunc) } -# Prints the partition path from a PATH:PARTTYPE[:PARTUUID] string. +# Prints the partition path from a PATH:PARTTYPE[:PARTUUID[:PARTLABEL]] string. partitionPath() { awk -F: '{print $1}' <