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 DDF34B42D; Wed, 26 Nov 2025 19:37:06 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id B4CF9B375; Wed, 26 Nov 2025 19:36:58 +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-xb134.google.com (mail-yx1-xb134.google.com [IPv6:2607:f8b0:4864:20::b134]) by atuin.qyliss.net (Postfix) with ESMTPS id 4D6C4B353 for ; Wed, 26 Nov 2025 19:36:57 +0000 (UTC) Received: by mail-yx1-xb134.google.com with SMTP id 956f58d0204a3-6420c08f886so144534d50.3 for ; Wed, 26 Nov 2025 11:36:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764185815; x=1764790615; 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=B2Whfup6y7PPWRPlGNZf7KpSh85+D9R/MQ89tIWHvX8=; b=ArwREiXQVTGT+srIrNnQRWsAWRFxFsTV/zskoIm3GS//ZppiMno/RqGZIvsllJbBdJ Fl5CMfCz+U1vt93DvwU00YcQHBRi8qqb2jyA267k852zuFsf3uALoYNQzCzjnRS4XbbY 6SUKe64igQpph4xxyHznna+q6k6xdKVV3Tp70YeLXpic3EQeYbrZKJW1YI23SSwzAqjn 0R3sbyN+Tfrb5vZTnAX1D4R+a6Qnbb3VOUFegZ1jpXVar8W/mNl/R+Yp7/B24kgw5YH5 65Hf+c6IC2Xt5auUiD9Q+v4nEL67PbaB8JBcHJsbv/Jhusr3hw0d5w2H90CzZLSCbsIb ygrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764185815; x=1764790615; 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=B2Whfup6y7PPWRPlGNZf7KpSh85+D9R/MQ89tIWHvX8=; b=jIHeEqmpqNRFe7+WQ/oEIFhSZKecAPb4JbQohrkmbEmfbBk0IdCf2hcw28C2+j48q1 n/XJ12bwOW3gXx/tYu2LExo8u+h33MvjoAjRRljIiZ6xiBH1Rq4qBQtq4YoSOJvB2Yj4 MZ+4/hJJf/HRHIS0QxU/p8+c6j8S5un2/zbCqhRHxxSz5Mu3O4liTZj8oPx5uPVSAnYd xxMwF1kwkJHMzMku4jOTJ4E0xGAbbuFsyVLjmNsuFD0bIoIoYVQ1zDv2pFCscPu4ithN n6rb64TncJai410enNKI1dagAkPboFaoeSRQg8yuoxJyK1AvSrIQC7w/aT8Noi+Byse+ EKZw== X-Gm-Message-State: AOJu0YyLbbaxz/Xw/Kidno2ilELZKfBc4qZ0/cpyv6kB6pvNhZdmPOk3 jB8hIy74aNH8wysSM1Jsno4yUS6z4u6J8lNdrHmFEwR3I9cKqKvd2KfQxqc84w== X-Gm-Gg: ASbGnctCOAokz4/vu+RJzMY2d4JymPWYnGAjll7Wm4Gw6YQlZasV/TJ0z0o2zP9yldz xl1QH5Mrdo37lImyzlKeUf66QhN4d+MxlNApjEj5ncS7/Ct6PzBKZZlmH/Zo/I76dirELYxJkb7 Qz4O5XecSdKkEPerFY/dkFgwl7hksFI0BUyYoOuKa/m+JCXIa2wI4w4yS2/igVv9U/zsKXyzyba Q9eSXYqQi3xfS+9yWseCNos99MWqzrEwnF8bndDtFM3cRm79lxvFdSkb8uudsHgRS6Q+tXoB7y+ t2fE/0H4SEvfbdloVYX8/COqIMIPn0vUTUjc5duEYApK1Ap1LdrrZlQ0D+QWwGp5e+Fj80ON5/o oT649noYBolG/gl8snOZI/O1+s0Btprol+Z7yceZo1Lt+fYp7Rwri1U53hco0l60kgl2fUp/3lF PsSDERfBRSoZW3nWV7pHDZ9UrsP2S7JS6xRWqFHVmnzSCSdmwp9vdUcKkjt9G8irf6XpQTK+y7j Ndc/BlQA5mGTpsD629pkW/2YmE8IRe2tGc= X-Google-Smtp-Source: AGHT+IH7rkWqAFr2ugX1GsYxldcRm3IAsQdsGx+L9NPLW9Sv+29LYJ3fw6FoLyIILoHVlOTML53uZQ== X-Received: by 2002:a53:d056:0:10b0:63f:bd3e:18c5 with SMTP id 956f58d0204a3-64302a3ab4amr12584327d50.9.1764185814925; Wed, 26 Nov 2025 11:36:54 -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-642f70b1dbcsm7573719d50.11.2025.11.26.11.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:36:54 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:34:01 -0500 Subject: [PATCH v4 03/13] scripts/make-gpt.sh: Allow specifying partition size MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-updates-v4-3-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=1377; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=J1v+sK9YnBg0vjRVfksHv4sOhuiBHMKz+LDSUMcHO+8=; b=FDdromTlrL2/zt1BaWdrifHKau0Hk353NTvwTAckOKpykpbw/zLtv7EDNgQK0Free/ZBYCTB7 COxtydqIqMoBbON2XHE06REmLRC6HP4DSGIsTo6HVTx45tNx07Q58Hp X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: NEKUTEWZDHSDXB7WDYT3RDU2363QYII7 X-Message-ID-Hash: NEKUTEWZDHSDXB7WDYT3RDU2363QYII7 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 requires that partitions are large enough to hold the newly downloaded images. This requires that they be large enough to have room to grow. Allow specifying the partition size manually, overriding the default (the size of the file that will be copied into the partition). Signed-off-by: Demi Marie Obenour --- Changes since v4: - Remove the MiB suffix. Changes since v2: - Split into separate commit. --- scripts/make-gpt.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/make-gpt.sh b/scripts/make-gpt.sh index 0ae3d0005e5ae7d6214270fedb2fafb0a7064cf5..c3f16e6c029d1d27d3da9e05e50945a56bfad9f8 100644 --- a/scripts/make-gpt.sh +++ b/scripts/make-gpt.sh @@ -45,8 +45,13 @@ table="label: gpt" # Keep 1MiB free at the start, and 1MiB free at the end. gptBytes=$((ONE_MiB * 2)) for partition; do - partitionPath=$(partitionPath "$partition") - sizeMiB=$(sizeMiB "$partitionPath") + if [[ "$partition" =~ :([1-9][0-9]*)$ ]]; then + sizeMiB=${BASH_REMATCH[1]} + partition=${partition%:*} + else + partitionPath=$(partitionPath "$partition") + sizeMiB=$(sizeMiB "$partitionPath") + fi table+=$'\n'"size=${sizeMiB}MiB,$(awk -f "$scriptsDir/sfdisk-field.awk" -v partition="$partition")" gptBytes=$((gptBytes + sizeMiB * ONE_MiB)) done -- 2.52.0