From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4064CCE1B; Sat, 22 Nov 2025 01:27:56 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id A67C2CD2C; Sat, 22 Nov 2025 01:27:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yw1-x112f.google.com (mail-yw1-x112f.google.com [IPv6:2607:f8b0:4864:20::112f]) by atuin.qyliss.net (Postfix) with ESMTPS id 9F643CC79 for ; Sat, 22 Nov 2025 01:27:38 +0000 (UTC) Received: by mail-yw1-x112f.google.com with SMTP id 00721157ae682-787eb2d8663so40605767b3.0 for ; Fri, 21 Nov 2025 17:27:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763774857; x=1764379657; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TUCwAhTsfZsgYH8a12kBO2wb5ScsjRhFLB4mZaD9Tec=; b=H2/M2teCR7Pvdqr/7dlB1ekYNcqhYQemHrqisCVmKCC5g6iBRJ6oSn7iKIUYH+JkhD waxnzyNKlk0J6U3qqAHVMCZdbFHdg2PgLF/en6utrLTq+GXABp+PA9IpvDF4YjYJonke xpQ54+2nURvCnGGseJPreiUobuFvNNR/EQR1Pm15vSGJPMOPOSMJUu3JZmCjSmzYl0Bj 0If2HtDNmQ/yWPd2VpFOtLt6rZJ4DM+oYZ7jcOFZqVx/UIruk2cRS+lx5UFDxG7dIki1 ZXZmWXMextq6FddOTP7MDU81MTwIICyTdH0UJVJRePXroLQjMC61GXVNsTQMc4L0hUam 4KTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763774857; x=1764379657; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TUCwAhTsfZsgYH8a12kBO2wb5ScsjRhFLB4mZaD9Tec=; b=l4FZvMUsARmc8ULKhM3bpY7BGOqM6x8/nbjrem7Uq1LMadpMp4RV/IvILt9GUz4waY nuG15cDgm34YZoCk+YOqFLG2o42LJXQ9od7qcYglXodRoWtnXCWpAbiF9ZPRbkRnFnX0 pccKSb5fUnfkzFYROcqHfhXks2wzuPPo+zM1IQ2L/MRteskAobnxl+QXYzF2Ca7jqBPf ffkpERmbNmjXLjzFxlxYdiqQZEwhmAKoAOYyEdVkbHGa5kWMqrlzikee0pJ4bmvge+Y3 luthTl4RhnsLnL5Y1QCYyGQ3ykMLqncXMWl5XtByX1y7KXmYhDmJ5pVFqJLyQGzg5940 BLHA== X-Gm-Message-State: AOJu0Yx3rz5akQ5WIjry5dQL8hZl10cDoIT8Ddv0c7aFF9zk+A6NlrqT HtUT4GQwvRyeN6EqqJi+QHdo69uSft3RsrkeMdhCx6dcsvimP9WwBMaP+u53ow== X-Gm-Gg: ASbGnctIqK50UXX88TmLW30Iq3Kzx4VHPFpWrsh8Zj2AzATOIQs1arNEXVzw18696sy B6jSkQbbg52z9+h6gEIGT9TJJcf19L5AM0i3haGx+Hb1pDGA5jzQMWvclPDpmEVecduEZZJLGtg +nD45qj2aWrz1wFwTjZxxofjak0mKaXWnzEe22YG+lE4lKzoOdU1y13QrX6p9MvQ6M1tDf5Zf13 STOYgntTnsQ8VYG1t5wF9J7Q6E5IPjxViSi/S24NdO13DgqR3/ZI2FGF2pD4ZSxW5UvpFbRpkXy TkiZdD45tLgmpUNHosUKp4dm95xp5jMgtfTB5N4DJDD/FHFZYF3znZmvK/eYSNHreLu+UAc4MqU 9lt7DToH51hgzmcTspPI3W9Dvn6MD6cPiji89N1dA9EPfvTALOj4NTk3yjGjpYxo7HXZONrtZwf aocrDc1OCmrbE5/dSw1XviEk1T00JwdF9sPHbA3FGNIJec0arjJHHs1hz9QPRbs7OyOe1w1Cz2m NbEY6PPT94oQsM1K7fTDpMtPya04G74hqM= X-Google-Smtp-Source: AGHT+IH+vM4ly5HW1211Nt7pXRzOCilfhEHWsGY8FFWwYY5MweZExCdr8BPbb8rlBu4RoeoZbCF5TQ== X-Received: by 2002:a05:690c:a9a:b0:786:6b8a:7b14 with SMTP id 00721157ae682-78a8ab2fdd6mr42261147b3.12.1763774856499; Fri, 21 Nov 2025 17:27:36 -0800 (PST) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-78a7993cedesm20568407b3.41.2025.11.21.17.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 17:27:35 -0800 (PST) From: Demi Marie Obenour Date: Fri, 21 Nov 2025 20:23:28 -0500 Subject: [PATCH v4 06/14] Support generating multiple partition UUIDs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251121-updates-v4-6-d4561c42776e@gmail.com> References: <20251121-updates-v4-0-d4561c42776e@gmail.com> In-Reply-To: <20251121-updates-v4-0-d4561c42776e@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763774602; l=6104; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=igUh19EvNMmPchUSz+0PpVKgj0buPcIq1X7nKzOq7ig=; b=jceH4QG6RPWsGI+U1c00lvey1OUxA28EVv6R4qdSMbkumax22xsM6R/D0RTor9z/k9dDOfzBg wyxylQhCT66CFRNVnf+qkn0AQcXtmRb5F+FLp878NDW0q9qNSoH6NOF X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: FESKFNP7POTJQOLRPAEIIBKO7SPVFPY4 X-Message-ID-Hash: FESKFNP7POTJQOLRPAEIIBKO7SPVFPY4 X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Demi Marie Obenour , Alyssa Ross X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Generate 4 partition UUIDs instead of just 2. Port scripts/format-uuid.sh to awk to make this much easier. Signed-off-by: Demi Marie Obenour --- Changes since v2: - Split into separate commit. --- host/initramfs/Makefile | 8 +++++--- host/rootfs/Makefile | 6 ++++-- release/live/Makefile | 8 +++++--- release/live/default.nix | 2 +- scripts/format-uuid.awk | 35 +++++++++++++++++++++++++++++++++++ scripts/format-uuid.sh | 19 ------------------- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index fd8cbb6c3e775ed27d0a524bf167cb4d3940d799..27a26b46a8110d35ee02a63b12931d6b9c2742e5 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -35,10 +35,12 @@ build/mountpoints: cd build/mountpoints && mkdir -p $(MOUNTPOINTS) find build/mountpoints -mindepth 1 -exec touch -d @0 {} ';' -build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk $(ROOT_FS_IMAGES) +build/live.img: ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) + uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ + set -euo pipefail -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ - $(ROOT_FS_VERITY):verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ - $(ROOT_FS):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") + $(ROOT_FS_VERITY):verity:$$3 \ + $(ROOT_FS):root:$$1 mv $@.tmp $@ build/loop.tar: build/live.img diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index fcfbc3e437fdb108252ba77d4d4e8f4f636ffd78..f02bb76371f000e3f65bb7c2a7f217d437845481 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -90,9 +90,11 @@ clean: .PHONY: clean build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk $(ROOT_FS_DIR)/verity-timestamp $(ROOT_FS) + uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ + set -euo pipefail -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ - $(ROOT_FS)/rootfs.verity.superblock:verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ - $(ROOT_FS)/rootfs:root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH)") + $(ROOT_FS_VERITY):verity:$$3 \ + $(ROOT_FS):root:$$1 mv $@.tmp $@ debug: diff --git a/release/live/Makefile b/release/live/Makefile index a79947c57d562677760bc669c66320953a2b0d2d..78361a48512a37514ba0e57e0cc8b0ec3a71664b 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -9,11 +9,13 @@ DTBS ?= build/empty dest = build/live.img -$(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) +$(dest): ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) + uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ + set -euo pipefail -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ build/boot.fat:c12a7328-f81f-11d2-ba4b-00a0c93ec93b \ - $(ROOT_FS_VERITY):verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ - $(ROOT_FS):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") + $(ROOT_FS_VERITY):verity:$$3 \ + $(ROOT_FS):root:$$1 mv $@.tmp $@ build/empty: diff --git a/release/live/default.nix b/release/live/default.nix index ac2d7a55fd4fe0c02108309ecea20e368000af0d..98cb4862e239e3ad9ddbd7b5ace5716f57df683b 100644 --- a/release/live/default.nix +++ b/release/live/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { fileset = lib.fileset.intersection src (lib.fileset.unions [ ./. ../../lib/common.mk - ../../scripts/format-uuid.sh + ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk ]); diff --git a/scripts/format-uuid.awk b/scripts/format-uuid.awk new file mode 100644 index 0000000000000000000000000000000000000000..a5349d68a4d29be5f750650236420c9b5a7257eb --- /dev/null +++ b/scripts/format-uuid.awk @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: EUPL-1.2+ +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour +function format_uuid(arg) { + if (arg in found_so_far) { + fail("Duplicate UUID, try changing the image (by even 1 bit)"); + } + found_so_far[arg] = 1; + print (substr(arg, 1, 8) "-" \ + substr(arg, 9, 4) "-" \ + substr(arg, 13, 4) "-" \ + substr(arg, 17, 4) "-" \ + substr(arg, 21, 12)); +} + +function fail(msg) { + print msg > "/dev/stderr"; + exit 1; +} + +BEGIN { + FS = ""; + RS = "\n"; + if ((getline) != 1) + fail("Empty input file"); + roothash = $0; + if (roothash !~ /^[a-f0-9]{64}$/) + fail("Invalid root hash"); + if (getline) + fail("Junk after root hash"); + found_so_far[""] = ""; + for (i = 1; i != 49; i += 16) { + format_uuid(substr($0, i, 32)); + } + format_uuid(substr($0, 49, 16) substr($0, 1, 16)); +} diff --git a/scripts/format-uuid.sh b/scripts/format-uuid.sh deleted file mode 100755 index 3b38278aef640b2cd540d6606b05dd62018e48a6..0000000000000000000000000000000000000000 --- a/scripts/format-uuid.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -eu -# -# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross -# SPDX-FileCopyrightText: 2022 Unikie -# SPDX-License-Identifier: EUPL-1.2+ - -substr() { - str=$1 - beg=$2 - end=$3 - echo "$str" | cut -c "$beg-$end" -} - -u1=$(substr "$1" 1 8) -u2=$(substr "$1" 9 12) -u3=$(substr "$1" 13 16) -u4=$(substr "$1" 17 20) -u5=$(substr "$1" 21 32) -printf "%s\n" "$u1-$u2-$u3-$u4-$u5" -- 2.52.0