From patchwork Fri Apr 21 12:18:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 6803 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Q2tpm6xDhz3xDh for ; Fri, 21 Apr 2023 12:18:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Q2tpl11Tyzc4; Fri, 21 Apr 2023 12:18:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Q2tpk6XwWz2yT6; Fri, 21 Apr 2023 12:18:22 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Q2tpk2Fxbz2y9y for ; Fri, 21 Apr 2023 12:18:22 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "michael.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Q2tpj58KQzZ3; Fri, 21 Apr 2023 12:18:21 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4Q2tpj3fDRzTh73; Fri, 21 Apr 2023 12:18:21 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] Increase size of /boot to 512 MiB Date: Fri, 21 Apr 2023 12:18:14 +0000 Message-Id: <20230421121814.2325507-1-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Is XFS is being selected as file system, the minimum size requirement is 300 MiB. In order to keep it to a round number, this patch increases the size of /boot to 512 MiB. To keep all systems consistent, we will also do this on systems that are being formatted using different file systems. Fixes: #13077 - xfs cannot installed anymore because boot is to small Signed-off-by: Michael Tremer --- lfs/flash-images | 4 ++-- src/installer/hw.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/flash-images b/lfs/flash-images index e6b25da1c..464ad5edf 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -77,9 +77,9 @@ else PART_TYPE = L endif -# /boot: 256 MB - OFFSET +# /boot: 512 MB - OFFSET # / : 1800 MB -S_BOOT := $(shell echo $$(( 524288 - $(S_OFFSET) ))) +S_BOOT := $(shell echo $$(( 1048576 - $(S_OFFSET) ))) S_ROOT := 3773292 ifeq "$(EFI)" "1" diff --git a/src/installer/hw.c b/src/installer/hw.c index 9d11d85de..894b887d9 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -490,7 +490,7 @@ static unsigned long long hw_swap_size(struct hw_destination* dest) { } static unsigned long long hw_boot_size(struct hw_destination* dest) { - return MB2BYTES(256); + return MB2BYTES(512); } static int hw_device_has_p_suffix(const struct hw_destination* dest) {