Message ID | 20240315191442.3951-5-stefan.schantl@ipfire.org |
---|---|
State | Superseded |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 4TxDTf3Lw5z3wnw for <patchwork@web04.haj.ipfire.org>; Fri, 15 Mar 2024 19:15: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 4TxDTb6xVWzFLV; Fri, 15 Mar 2024 19:14:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TxDTb6S11z32pl; Fri, 15 Mar 2024 19:14:59 +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 4TxDTW0d0Cz32p3 for <development@lists.ipfire.org>; Fri, 15 Mar 2024 19:14:55 +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 4TxDTV54mmznj; Fri, 15 Mar 2024 19:14:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1710530094; 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=k655GFZNOMr7iC02f8rz2U1t2ReEzsVZh+8DzpbuBR0=; b=0B9XEfpH3H2spFKEDVB09TWaHN+WwNjDVgYbQQKEgZFLHC1CD7tAZgv3QCGdfc1y0kPTay TIRfX8X8YQDJN1Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1710530094; 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=k655GFZNOMr7iC02f8rz2U1t2ReEzsVZh+8DzpbuBR0=; b=DZMPjbjZSr7cwhxg6liEIlqSqTbDkdNBVOYIeGqWVPfpEzETYYw800reJxZhLdUSYY82TW DhKrfaSCQhm4IMOMeTD0sqS/yZAgUOmDzANZ9v7cVaVgTdcbM5HvQyFWnnxhR51H9uuYhT jk2asWBPGHnp9FsPTlYIahEQkU0KFIapqDLZ1SgMV04O02QIoZW6qf+b6wy9md0GWQg80E r2GRd8UVm0HU2EwQ+8J/8NO7AxsdH7BZRixpdPiIl92VuYrhudMuxYwOQjNuX/VTjmLgUB aeOB+0vmbwDErnd5QA/NRqwCjcepofY1Klihskx6ia6e00xekbOpaGX9jnPzxw== From: Stefan Schantl <stefan.schantl@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 04/17] installer: Disable seperate boot partition Date: Fri, 15 Mar 2024 20:14:29 +0100 Message-Id: <20240315191442.3951-5-stefan.schantl@ipfire.org> In-Reply-To: <20240315191442.3951-1-stefan.schantl@ipfire.org> References: <20240315191442.3951-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 5GPQNDDWNNXX3PYHFCWGS4ZO463YBK3X X-Message-ID-Hash: 5GPQNDDWNNXX3PYHFCWGS4ZO463YBK3X 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 <development.lists.ipfire.org> Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/5GPQNDDWNNXX3PYHFCWGS4ZO463YBK3X/> List-Archive: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Owner: <mailto:development-owner@lists.ipfire.org> List-Post: <mailto:development@lists.ipfire.org> List-Subscribe: <mailto:development-join@lists.ipfire.org> List-Unsubscribe: <mailto:development-leave@lists.ipfire.org> |
Series |
BTRFS support on IPFire 2.x (experimental)
|
|
Commit Message
Stefan Schantl
March 15, 2024, 7:14 p.m. UTC
This will merge /boot and / to be on the same partition.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
src/installer/hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Can we have Arne sign off on this? We could in theory only disable the /boot partition when people have selected btrfs. The flash image will keep a /boot partition and I don’t like this kind of inconsistencies between different installation types. -Michael > On 15 Mar 2024, at 19:14, Stefan Schantl <stefan.schantl@ipfire.org> wrote: > > This will merge /boot and / to be on the same partition. > > Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org> > --- > src/installer/hw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/installer/hw.c b/src/installer/hw.c > index b9ed92459..81be87471 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(512); > + return 0; > } > > static int hw_device_has_p_suffix(const struct hw_destination* dest) { > -- > 2.39.2 >
diff --git a/src/installer/hw.c b/src/installer/hw.c index b9ed92459..81be87471 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(512); + return 0; } static int hw_device_has_p_suffix(const struct hw_destination* dest) {