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 41121B8D3; Wed, 26 Nov 2025 19:42:13 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 02856B7E5; Wed, 26 Nov 2025 19:41:59 +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-xb12f.google.com (mail-yx1-xb12f.google.com [IPv6:2607:f8b0:4864:20::b12f]) by atuin.qyliss.net (Postfix) with ESMTPS id 55DFDB7B7 for ; Wed, 26 Nov 2025 19:41:53 +0000 (UTC) Received: by mail-yx1-xb12f.google.com with SMTP id 956f58d0204a3-6420dc2e5feso115791d50.3 for ; Wed, 26 Nov 2025 11:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764186111; x=1764790911; 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=my4YnXLR/VJEsqI25b2vbuHEyxYRlnDg5J6DKesSe3itKVFJ5oSemO87UUXi8LLB2D ivplVGxivhbhPpZnBQYytxekFgBqO/Th1S7SYf60Dur9MRfMx7m8+ny0K7qnkxkHKsQj jh8iu99szdi9+FCgpKl1PXBRCzHtotV/fiu9LlhiwOOLyrgJL5Yh7RNofvAftczwhEAi RawGbqdYf5HsfWYpuvhGkRMM4HbkhaAx/7era3Vl9V+4yT9elx5DD2TGk9L7dXFmw8k4 J391NAg6CdX9HGFJ7t415Gno+lOft3r+9Aua2MEqrWL1cX2Dg19vvMbnXVCCYJ6D3Ulu s0ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764186111; x=1764790911; 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=pUgw4+JQaXC9j3BYEv4l+NK9hQugH9ETcazHnc3SBpwMpKov0/JmUzOYpDwKFh18xT Mu6QYika1CSGAd+GodveTCkM9bHrI/2vWkEAFO3gq6iug9Q6w96aTzNFUxIvCFpNeHK1 X91/CEl/QniH5fPnA973ZrgbXWub344rARR2Lis3ONBRqwAodE/8raxtwaeCQXjtdf5o vEjZ19LYv145Z2gUv2Bh0w0dNrtgvzGiUi54J5Jc0A2Kg2kYj6Xbyya2w2pWBOURZya4 2FONnZD7TvtyiYexn4NT5Lp6EmnBLebm4xJg78XKtp6Nz6ZMa4qIEfV0uK4N21aR0kNe BmFQ== X-Gm-Message-State: AOJu0YwgUe4SYgEfTBvcUD2QMqknDFDEWw1SC0DW+bM3nsFw+w9T8PPy U5DSBsxUKNMz29ciApri7sVEabMDlowor76gSTCAN3Syu63sEZgKVnDlmGKwWA== X-Gm-Gg: ASbGncsIWTSdkr+cT88pIxbOZDinwNOw7/CUZ0H9J+ATM3BSKJSY/RWkmqnBd4KG1oV qlYYsB5BTuHRSl8OLptz+kWruac5NQIvE9r/bFNl2w/utaRAMgfEpGbh0NzKJYklvRqRkcoSOSA Q0/jLoOVOu8+vdZtQeSPJtQaNjSOgMLpl2R+lLxpdx7oNgwpsfDG2128SZll5GMEhuuze5mY6IF u7YTc6PynSDZJjG8QduT8ur2nd/6pq8Q5MN+P7tWUiHAqmjbyQO854f9ygV1eHLaunJ3rZtjbB0 mAjhkRq0LbWU7H+7NaEWtvhwiJtvauCBESydHiB/7cX8x0+c/ksCpVikBMPaC9GUx9o9IqLkg2a SyVureMxzqJR3R5YE25x+K/4ECDO73SItKA+K2L7cUBK3gx+wojUL7Pi7LND5OCFskRnzNEI/OO yI0pRyArS1h/5eUxvsimu3jepRTZdS3fAKnPS8pDmDxInLnIMM98RSrj3KbePQMJ0xim5o/hU3h cyfZG8zaSvoLN7AmTou/Lwn+zzzH32qf1k= X-Google-Smtp-Source: AGHT+IHwbCanRNjD7j3LWRbrQL+bAbpcKXWSHyUbk2uH/R6xvhWL3FE9mBaPxhG9+9ocQn2izEjhww== X-Received: by 2002:a05:690e:408b:b0:63f:a6e9:c6c8 with SMTP id 956f58d0204a3-64302a4c700mr14545067d50.26.1764186110996; Wed, 26 Nov 2025 11:41:50 -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-643259fd696sm3002727d50.7.2025.11.26.11.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:41:50 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:40:49 -0500 Subject: [PATCH v5 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-v5-9-fd746748febd@gmail.com> References: <20251126-updates-v5-0-fd746748febd@gmail.com> In-Reply-To: <20251126-updates-v5-0-fd746748febd@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764186041; l=2789; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=nSK4CYBgcXh6dIA8YdCYlDmFKqrwwTg7Q8JT1TDHgMY=; b=KXh55ei1Jnha2ZWr/3ANwLJMmC89CBtVZoSO+IYf5b9PDJVBhhLkVdlAhoN/TVtoBTxMEljk8 Y/LwT1k7F65CmyYiqQga23NHlfhvxUbP0vFpp0HJZHDZg5vjXd9ecry X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: ZU6ZAIWLYIAP2TYHJIZ6UIPFGGJXJ22X X-Message-ID-Hash: ZU6ZAIWLYIAP2TYHJIZ6UIPFGGJXJ22X 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