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 D714CB599; Wed, 26 Nov 2025 19:37:27 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 4CB0FB47F; Wed, 26 Nov 2025 19:37:13 +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-yx1-xb12d.google.com (mail-yx1-xb12d.google.com [IPv6:2607:f8b0:4864:20::b12d]) by atuin.qyliss.net (Postfix) with ESMTPS id 72BB6B41C for ; Wed, 26 Nov 2025 19:37:03 +0000 (UTC) Received: by mail-yx1-xb12d.google.com with SMTP id 956f58d0204a3-640d0895d7cso217873d50.1 for ; Wed, 26 Nov 2025 11:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764185821; x=1764790621; 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=OMUrX/s4znP7kOqZ1xBzbTeRFuQAwpp3skAM11qmdq4=; b=b6NOjSwIo/sy7uZ6R8Lk53YhhdvX8uLPdxATa7q4U+R8Hrip0NC6h6OyTvnkjVT1t1 HvhwD7cUn2eei1Fnh1CPPBO0o0S/ZkQsijvByZdbijDdq+gknmFDCxsNFUcH+eS3DcaN exYEPkjqQdvyXaGdTSPw8ol5vf51yXcS4keZS1Eok7GEOu/9kcClpz8nrEdynnVRhDxD 7bsit7H5EoNwVEuFpallg3sCcjM/MoYQE5M8ggz6AZfMnq2TPzO7wS9wH9qct7QArMNT YMzkWxVxZaC1jeZJHHVXae9WBItm4aIejcL5abgYloqlYRdEfjglqSPG2v3KOZJEmBgW meoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764185821; x=1764790621; 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=OMUrX/s4znP7kOqZ1xBzbTeRFuQAwpp3skAM11qmdq4=; b=tkn+K7Ey+SGBybjr1arkv99alEM/Pa5qdTFyZaJcovdcy4ZzHlcU9G7GgEIE9NHGq5 LpXvoNM3V5TAbFxoXF5A4lMzCsVdTCmAk1cO2RV8sJoJN2YQkKLv2RwX8NdtGH2nCeSc EZElSm46LqrQyC9DossjUm4de/XrfOGcoNX4k1tniunhtKjrBTaFr5nAyGHyFqe7sRxr 2oBqccWX1Pewid5S2EL5oKIPsctfMNSmFKs/GcWoHeR0HWgMlzASFXOK4Aw6TrSQQ6wc zQF6wLXIP0V8xYDWIQbF9+1uZ7utynSu+sGjYkDaUonbA196/dq+LoMPl/PJ0dhzm/eA dVfQ== X-Gm-Message-State: AOJu0Yxaf0rXTe7F2AZSfzkqRk9RcMn3ETTPvoUkfJ3Jt123qz0iekqC qTCMl1ctnIUe9Z6g5d9I5jK5yp2I9SfsjFQHpJWKmfO1RY2oabZRUtJH5NQzNw== X-Gm-Gg: ASbGncsFdS9UMDsHLplfWOC3SD13DMP+xOmT23+e+8n3abPqf1V8ENAf9B1Huw4DXpJ ZGiV2qI8gKZTNrAuqu1WqHAl8ei0l9sCQYaxDgiMso2Q2Kd7yBB0QHcP5siiRK+13dQyPvPGw4w UX1lzP75sjsfNGRA6ql/8e93olpgb+r4ZxmCE+slQscjEVoec6PeC4DyaC2oXUDtlCJy1e6VtUm LoVV3k6yCy78dZkLCvlwXxcWhaTem0M0J4GSjR8vaNFaqu/M5l9kOJbzMhAwck7wR1Eug1GgOF/ qtYBVnjg4eJtds+ih7XXUdtzyp0a6k8+DGgDDTaTTb0sgZsLna0WDiS/5HDENUvQULtQeoYY3Ld SQwRwAj7qmW0UvKS3C45BhVH12UDpawHX9pxLdBUzsdUtyiYa+I0DkvCHsmUN4VjO39X22+hYPz JUQ/hwt7007rd6WunDe0Hc8Lj0+w6gCBcErDglD7SgDRzvV2lKnS7iqMXbBgHjSFlD2Vo3Blc9P C+HcmAFOt2ndYl8d7Jw8WVYnJphNl340EY= X-Google-Smtp-Source: AGHT+IGgR1OVsfpIjlIraG9cT32Vd32tQgLfxyHYI7C1Jj91XtecDjYQ+Nn5+uGej1abKBDZZhhDpA== X-Received: by 2002:a05:690e:16a0:b0:63f:b49c:6116 with SMTP id 956f58d0204a3-642f8e2dbc5mr17524500d50.23.1764185821110; Wed, 26 Nov 2025 11:37:01 -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 956f58d0204a3-642f718c01bsm7581548d50.20.2025.11.26.11.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:37:00 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:34:07 -0500 Subject: [PATCH v4 09/13] Add B partitions to installation images MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-updates-v4-9-40c438d2dcaf@gmail.com> References: <20251126-updates-v4-0-40c438d2dcaf@gmail.com> In-Reply-To: <20251126-updates-v4-0-40c438d2dcaf@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764185638; l=2789; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=nSK4CYBgcXh6dIA8YdCYlDmFKqrwwTg7Q8JT1TDHgMY=; b=5gQtKcTYKhCk8v3fpV7NGHyAzWrlXQSOw4zaDbEVjEfKBcnBYye3XEO+4qrnRTF+VjF5JbNoI DUsh+QbUqDADtumTGNxeDcCTKDCfMd7UGv5lXRmXBy2COjTGNK4YyE0 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: SOKIC6FGEE5EJUNYGVRKKBDB6HZKTQPI X-Message-ID-Hash: SOKIC6FGEE5EJUNYGVRKKBDB6HZKTQPI 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: systemd-sysupdate never writes to the running OS partition. Instead, it requires a separate partition to write the update into. Create a separate partition for that purpose. systemd-sysupdate will fail if the OS image does not fit in the partitions that the installer created. Therefor, make the partitions very large so that there is plenty of room for the OS to grow. This requires rewriting the code that calculates the partition sizes. Signed-off-by: Demi Marie Obenour --- Changes since v4: - Leave B partitions empty. - Leave MiB unit implicit. - Use fixed GUIDs for blank partitions. Changes since v2: - Make into a standalone commit - Do not rely on separate script to generate the images. - Use a smaller size for the verity partition. --- Documentation/development/uuid-reference.adoc | 8 ++++++++ release/live/Makefile | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/development/uuid-reference.adoc b/Documentation/development/uuid-reference.adoc index 146615896104d5ab20c2e9353e5ed8f7a3dc54a6..16279c8a7e690bbaafdc3e0194f3130ba65c281c 100644 --- a/Documentation/development/uuid-reference.adoc +++ b/Documentation/development/uuid-reference.adoc @@ -59,6 +59,14 @@ Spectrum combined live system / installer image. The Spectrum installer system. +=== `18f2ccff-92f1-4bb1-a80e-24f76ecda90c` + +The not-yet-used B verity partition. + +=== `ec0c5ff3-f6b1-4adf-82b4-61336c4d135f` + +The not-yet-used B root filesystem partition. + ''' == Finding Undocumented UUIDs diff --git a/release/live/Makefile b/release/live/Makefile index 46628bdaa5b4a02aca3dd15be4477c3b2c194993..12b13d6e730c494086d1e7f763495ffbd4bd4b88 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -10,12 +10,15 @@ DTBS ?= build/empty dest = build/live.img $(dest): ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) +# 162MiB was calculated by running `veritysetup format` on 20GiB from /dev/urandom uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ set -u -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ build/boot.fat:c12a7328-f81f-11d2-ba4b-00a0c93ec93b \ - $(ROOT_FS_VERITY):verity:$$2:Spectrum_'$(VERSION).verity' \ - $(ROOT_FS_IMAGE):root:$$1:Spectrum_'$(VERSION)' + $(ROOT_FS_VERITY):verity:$$2:Spectrum_'$(VERSION).verity:162' \ + $(ROOT_FS_IMAGE):root:$$1:Spectrum_'$(VERSION):20000' \ + /dev/null:verity:18f2ccff-92f1-4bb1-a80e-24f76ecda90c:_empty:162 \ + /dev/null:root:ec0c5ff3-f6b1-4adf-82b4-61336c4d135f:_empty:20000 mv $@.tmp $@ build/empty: -- 2.52.0