From patchwork Sat Mar 23 10:56:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 7663 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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4V1x3L3ZbHz3ww6 for ; Sat, 23 Mar 2024 10:57:02 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4V1x39248gzFLf; Sat, 23 Mar 2024 10:56:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4V1x362RJpz32vl; Sat, 23 Mar 2024 10:56:50 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4V1x2y6267z32vX for ; Sat, 23 Mar 2024 10:56:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4V1x2y3WnhzcG; Sat, 23 Mar 2024 10:56:42 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1711191402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gw0lHbSI8ihGFiQUE1yw0eHwyoXtV5KxilS5/t4T/Fk=; b=BAkK4beGt1j/JRrP96jLcqxS8MsoPTxCvf45y39+9hQvXDMspLF6RHaGNkNGBPq5S9PBbA aSwgGFseoRMqv6DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1711191402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gw0lHbSI8ihGFiQUE1yw0eHwyoXtV5KxilS5/t4T/Fk=; b=LmbOPza43WBJOqpUG0/IaYjmKH9Ew+99W4tzfwgYPSoUgn2lv12FMaYEcQ8tsRcd2E5xvW GaOwUa4ccfBMK0iFCmQ1wYmuvISNnn6Oq+WBb9T6bAwuQa7KeJqBCBPq9rAO9r3wgmsjWK erVcwsoJMDo2lDUwPWMO8epIhFEvSApYUmqLCOAfbZZr8V19sLmdYDaqOOpbjFz+47XHcu KBtt7woD/+xf5uzoz6W4JgRPhbAa1H3M6Haxu+jaNQg3ImVuj92ZHHhwXD/UrRP/xnQ0Jr hvwg3GGeI5RsRaQ0V7Zc07cFMhVjRpOyxmZ+4kcQR2jCVixzsS15WUwxUaGy5g== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2 05/12] installer: Disable own boot partition when using BTRFS Date: Sat, 23 Mar 2024 11:56:22 +0100 Message-Id: <20240323105629.371511-5-stefan.schantl@ipfire.org> In-Reply-To: <20240323105629.371511-1-stefan.schantl@ipfire.org> References: <20240323105629.371511-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: T2YNWGY57DRNJEEGDOD7JQUC2CLYURXX X-Message-ID-Hash: T2YNWGY57DRNJEEGDOD7JQUC2CLYURXX X-MailFrom: stefan.schantl@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --- src/installer/hw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 969c47508..11dbcd96d 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -563,7 +563,12 @@ static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* de dest->size_bootldr = 0; } - dest->size_boot = hw_boot_size(dest); + // Disable seperate boot partition for BTRFS installations. + if(dest->filesystem == HW_FS_BTRFS) { + dest->size_boot = 0; + } else { + dest->size_boot = hw_boot_size(dest); + } // Create an EFI partition when running in EFI mode if (hw->efi)