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 258401CA1D; Sat, 29 Nov 2025 09:51:23 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 32DF81C9AB; Sat, 29 Nov 2025 09:51:16 +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-xb131.google.com (mail-yx1-xb131.google.com [IPv6:2607:f8b0:4864:20::b131]) by atuin.qyliss.net (Postfix) with ESMTPS id 6748B1C99B for ; Sat, 29 Nov 2025 09:51:13 +0000 (UTC) Received: by mail-yx1-xb131.google.com with SMTP id 956f58d0204a3-641e4744e59so2666257d50.2 for ; Sat, 29 Nov 2025 01:51:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764409871; x=1765014671; 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=oPSyQgMxvpw3ITGa2mucL2ngBbDmIajeNn+3W5+c8hE=; b=DTzi9SEzc45NeyVQBKSONXM0Bg7LaMd7Ty9jOg0/SUzLmePbFVl6YxmcwsI6D80oQ/ BQx5gyOtQbv0uzfH+auMwnFUj4lSX9MACZmoMDqVp2E6MWQ1KnpPOK2hCCOCnVyQKimN QprvIDqvn5rIt2Mw8V6dt0f7JxqjzdnwJFcaNZqqlfL1mquLtkxiO0SS7ySKa6ZXL0bd k2KFpjO1bg0pPHvqCn4O3P4ZX81uMpB3wi9CbB/aF+U9m9VY+pCR2cVQxg/HQ/P/FrpO W84EIy0qkDlkU71YfSaBeBEngKlhjAvamzkE1T4YGWTb0gsEZp+DZRGn3Zxn181XQn22 LZCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764409871; x=1765014671; 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=oPSyQgMxvpw3ITGa2mucL2ngBbDmIajeNn+3W5+c8hE=; b=fkclCTfKSD4m+gke/IWc9CKl3556wOmF2lJmzhAuK+XbSOSeTdDlCMGQpxcuETPcCr PCK4QPBrtVx3RV9ZZb52r3xk/mCav0LMh2yIo+CMvUskz1oqAoJihwfRKhIi9sxRhLkP xuOcVFDh5BHghQ1mSdD2Nso4WGMXvJjCGakWdFIMEiOFW2+XGLHxG/ut9XZ4j3teKYCd 6adg7LqmXoGJYnUfwUJxF5MxqN5wWABeXda3Jlr46xO/TZDzboYhe8MFYz+VruSULln1 x49S9RkXMU9/03r9dM5XgTzvNH64WpTQalZwSnLH4qi0XRP9NrHPeJ8bj6MvxNEOR7ti aTuA== X-Gm-Message-State: AOJu0Yw0aRvU7gVIC/73DJ+SH6y2cdoY6l5WVr7DBYki/RHECWDYH1/y eCAVSGPcA+pTTGkO5G2CsQOkiIq4S3VKZq1E58DXKmzzQYkmC7IojZ6baUZwyQ== X-Gm-Gg: ASbGncvhH0PhoGWRMyZo5lhJfJnVP3ifvmqI20HCoYRbvKZkimE8vfMssVlNxfADdex MQE/M1yR1zR7j94IstO+QOu80eeocC9fI7W16wMGQ945Ymls+XqDD0cLpIzp8p2jRxDsLX2lQWw qiJ+5Eokfy1O/e6wKM2riPcZ0IVLeNQHm6NkivcAmLbpGIKWE+2/hQauprndpkCcmpRBe0RXkrU JE77gAmwJDGYxdNteUmVPhLPBw7eI/Fz8zMVu/TbvxghqF/g39RKhcJSX4qfzzL4KV+sGooXSqh aFmvxozOWQzTGZm6QrbTXWTorn03MFawnyjMnQtHnl0R1ZgYqI2kn21g6HN6NqGO42jOXldjizV r1d+FiJET5y6IGjBydGMwGd9Xei+vgEo84nmB2TZCRRXSv6FUba7oud97K3n6G6kk+oXq6a8IgU 7aQo6moHClPc3wsrBwfwSMUmDCGFzqW0cO9fZ2Obcl40R2e9tArmwayO1pPjXRrLwvbRlO+/8Cr w7npgVvY7MPXjOlXevgg+8ZsRA4r11KMRk= X-Google-Smtp-Source: AGHT+IEY1OlRvRgf0q0gX8uY+EFt0p9BUl1V67em9jx83O2U/hc0Leap1BkV7d8Zy+j9RMQsBzG/Fg== X-Received: by 2002:a05:690e:2501:10b0:641:f5bc:697b with SMTP id 956f58d0204a3-64302ae22e4mr19815301d50.71.1764409871032; Sat, 29 Nov 2025 01:51:11 -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-78ad102d7ecsm24109987b3.45.2025.11.29.01.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Nov 2025 01:51:09 -0800 (PST) From: Demi Marie Obenour Date: Sat, 29 Nov 2025 04:50:01 -0500 Subject: [PATCH v6 4/8] Add B partitions to installation images MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251129-updates-v6-4-9edb87a2e509@gmail.com> References: <20251129-updates-v6-0-9edb87a2e509@gmail.com> In-Reply-To: <20251129-updates-v6-0-9edb87a2e509@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764409797; l=3738; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=b3Yn2Larc2+/rx4VSHAQuuB66RirkAKOD2s7fcQ5AgY=; b=fgI3EY9UB/knMTK/mpmVt1z5twuV8NywyBthBVLuq5/2FvB11Mqo5IeLUOdbNyUZKuBUUIECu +hoxFES9HdwB5HhfSzD5wZ/9Hcb7jLwxWzEC2d1XK7TjG4T7htO0znR X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: REOUL4GAVRJWJTRKGFLPFRSVCMEDHGCP X-Message-ID-Hash: REOUL4GAVRJWJTRKGFLPFRSVCMEDHGCP 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 Reviewed-by: Alyssa Ross --- Changes since v5: - Rebase with old patches missing. 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. Signed-off-by: Demi Marie Obenour --- Documentation/development/uuid-reference.adoc | 8 ++++++++ release/installer/run-vm.nix | 2 +- release/live/Makefile | 6 ++++-- 3 files changed, 13 insertions(+), 3 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/installer/run-vm.nix b/release/installer/run-vm.nix index 37b470cba890f65c3b45e743edcaaed7396e5d3b..b9907f7b6e9b502eaf4255304e3a8efb3e3632d7 100644 --- a/release/installer/run-vm.nix +++ b/release/installer/run-vm.nix @@ -25,7 +25,7 @@ in writeShellScript "run-spectrum-installer-vm.sh" '' export PATH=${makeBinPath [ coreutils qemu_kvm ]} img="$(mktemp spectrum-installer-target.XXXXXXXXXX.img)" - truncate -s 20G "$img" + truncate -s 40G "$img" exec 3<>"$img" rm -f "$img" exec ${../../scripts/run-qemu.sh} -cpu max -m 4G \ diff --git a/release/live/Makefile b/release/live/Makefile index e856f4ccb841fd003d419955d79669fac2593cd6..64d74aeadb8c26de73d892be3a1fb0f54a450d08 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -10,8 +10,10 @@ dest = build/live.img $(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) ../../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)"):Spectrum_'$(VERSION).verity' \ - $(ROOT_FS_IMAGE):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))"):Spectrum_'$(VERSION)' + $(ROOT_FS_VERITY):verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)"):Spectrum_'$(VERSION).verity:162' \ + $(ROOT_FS_IMAGE):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))"):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/boot.fat: $(SYSTEMD_BOOT_EFI) $(SPECTRUM_EFI) -- 2.52.0