public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Stefan Schantl <stefan.schantl@ipfire.org>
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	[thread overview]
Message-ID: <20240323105629.371511-5-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <20240323105629.371511-1-stefan.schantl@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

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


  parent reply	other threads:[~2024-03-23 10:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-23 10:56 [PATCHv2 01/12] btrfs-progs: New package Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 02/12] installer: Allow to install IPFire on BTRFS Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 03/12] dracut: Ship BTRFS related modules Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 04/12] installer: Ensure to always create the /boot directory Stefan Schantl
2024-03-23 10:56 ` Stefan Schantl [this message]
2024-03-23 10:56 ` [PATCHv2 06/12] installer: Add code to create a BTRFS subvolume layout Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 07/12] installer: Add recurisve mkdir function Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 08/12] installer: Allow writing to the debug console from anywhere Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 09/12] installer: Mount BTRFS layout before installing the system Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 10/12] installer: Define common mount options for BTRFS volumes Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 11/12] installer: Add code to proper unmount the BTRFS layout Stefan Schantl
2024-03-23 10:56 ` [PATCHv2 12/12] installer: Add code to correctly write the fstab when installing on BTRFS Stefan Schantl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240323105629.371511-5-stefan.schantl@ipfire.org \
    --to=stefan.schantl@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox