patches and low-level development discussion
 help / color / mirror / code / Atom feed

From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH 2/6] scripts/make-gpt.sh: add support for labels
Date: Mon, 19 Sep 2022 07:36:56 +0000	[thread overview]
Message-ID: <20220919073659.1703271-3-hi@alyssa.is> (raw)
In-Reply-To: <20220919073659.1703271-1-hi@alyssa.is>

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 <hi@alyssa.is>
---
 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 <hi@alyssa.is>
 # 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}' <<EOF
 $1
diff --git a/scripts/sfdisk-field.awk b/scripts/sfdisk-field.awk
index b9fa457..0157027 100644
--- a/scripts/sfdisk-field.awk
+++ b/scripts/sfdisk-field.awk
@@ -9,7 +9,7 @@ BEGIN {
 	# first field.
 	skip=1
 
-	split("type uuid", keys)
+	split("type uuid name", keys)
 	split(partition, fields, ":")
 
 	for (n in fields) {
-- 
2.37.1

next prev parent reply	other threads:[~2022-09-19  7:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-19  7:36 [PATCH 0/6] Introduce a shared base for application VMs Alyssa Ross
2022-09-19  7:36 ` [PATCH 1/6] host/start-vm: support multiple block devices Alyssa Ross
2022-09-19  7:36 ` Alyssa Ross [this message]
2022-09-19  7:36 ` [PATCH 3/6] vm: build GPT images Alyssa Ross
2022-09-19  7:36 ` [PATCH 4/6] host/start-vm: boot using partition label Alyssa Ross
2022-09-19  7:36 ` [PATCH 5/6] release: rename from "img" Alyssa Ross
2022-09-19  7:37 ` [PATCH 6/6] img/app: extract from appvm-{lynx,catgirl} Alyssa Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220919073659.1703271-3-hi@alyssa.is \
    --to=hi@alyssa.is \
    --cc=devel@spectrum-os.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).