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,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 D412686B82; Sun, 9 Oct 2022 11:41:09 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 07D9886B0A; Sun, 9 Oct 2022 11:41:06 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by atuin.qyliss.net (Postfix) with ESMTPS id 0C35F86B05 for ; Sun, 9 Oct 2022 11:41:00 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 2301132001BB for ; Sun, 9 Oct 2022 07:40:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 09 Oct 2022 07:40:58 -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=1665315657; x=1665402057; bh=dE sCs40ccHQtTW/oqxruspfSQvyDicViebDpvdZgpms=; b=oKWKQk5QMW2hUsUPOH SLc+w7hjlRXrRNULjyVrhpoWhTsWd+0lS8nQhTqnU78lnM5GgLtto7BbLPf11b4Y sSltXfJMRUytv04V7UCoXFVTBRz/3mM1DeQRvSnxH++1U1g1BP1JXh/r1W4bovWv IOw7Je+Mf4CM9g7HZuPrFIs8FtyDG7pwy3mq4XzE0vw+1pw1eachflfKdKxPf0OF foaQORZXk3fgLu0vbxN8MU6dQsdbIuhJ/Bb5BAnnWJOH5t9Ce8GAzVfKThV9Dyws zRz1chMWI/6YO3K/h678IC/NYgBQfqB7NYaz5e1axdnJZcoevxaW9Z3DdJL+Vv/7 oGcw== 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=1665315657; x=1665402057; bh=dEsCs40ccHQtT W/oqxruspfSQvyDicViebDpvdZgpms=; b=PMgBCaJ9qsl5yE4ADUpwPfSPSCS7v UK93MUe7+3rzUFOOum9o4FFnOK/bRC/AmR64eeQ2J01zfK6eaTAXYFU5dInO74Ft PYk/oyNb8NfhmMSU+NRkBl/wDVOzQwPfWHzq4AyMAdpBqlDaimmcWI0pO1keDJrD 25o2OYANRhotloaxTylq4HCGAvK7p4rFJ3akTWSLjevkvj+E9KRM1kXxZF0FOi6y amjJ41G9eqYz0yVQHj2gZ7ngVpdPNoxNZnpG51fMoKSK+Qe4g2Cj8w8Sz8nrWXYi tYO6cxZiiw/Yrvp7rpkIzpRJ1UfV7OW+zndj2UfSNjxOkMASz6o3Ap8Sw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejuddggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 9 Oct 2022 07:40:57 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id CB30ED6; Sun, 9 Oct 2022 11:40:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v2 2/6] scripts/make-gpt.sh: add support for labels Date: Sun, 9 Oct 2022 11:40:32 +0000 Message-Id: <20221009114036.463071-3-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221009114036.463071-1-hi@alyssa.is> References: <20221009114036.463071-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: VV7Y4GIVX6YGBED2Y47KSGPMVXXYYCUW X-Message-ID-Hash: VV7Y4GIVX6YGBED2Y47KSGPMVXXYYCUW 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}' <