[04/17] installer: Disable seperate boot partition

Message ID 20240315191442.3951-5-stefan.schantl@ipfire.org
State Superseded
Headers
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

Michael Tremer March 18, 2024, 4:05 p.m. UTC | #1
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
>
  

Patch

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) {