diff mbox series

[02/17] installer: Allow to install IPFire on BTRFS

Message ID 20240315191442.3951-3-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 
  Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 src/installer/dracut-module/module-setup.sh | 4 ++--
 src/installer/hw.c                          | 8 ++++++++
 src/installer/hw.h                          | 1 +
 src/installer/main.c                        | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

Comments

Michael Tremer March 18, 2024, 4:03 p.m. UTC | #1 
Hello,

> On 15 Mar 2024, at 19:14, Stefan Schantl <stefan.schantl@ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
> src/installer/dracut-module/module-setup.sh | 4 ++--
> src/installer/hw.c                          | 8 ++++++++
> src/installer/hw.h                          | 1 +
> src/installer/main.c                        | 1 +
> 4 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
> index 26a257cf8..09564f885 100755
> --- a/src/installer/dracut-module/module-setup.sh
> +++ b/src/installer/dracut-module/module-setup.sh
> @@ -30,8 +30,8 @@ install() {
>     instmods virtio_net hv_netvsc vmxnet3
> 
>     # Filesystem support
> -    inst_multiple parted mkswap mke2fs mkfs.xfs mkfs.vfat
> -    instmods ext4 iso9660 vfat xfs ntfs3
> +    inst_multiple parted mkswap mke2fs mkfs.xfs mkfs.vfat mkfs.btrfs
> +    instmods ext4 iso9660 vfat xfs ntfs3 btrfs
> 
>     # Extraction
>     inst_multiple tar gzip zstd
> diff --git a/src/installer/hw.c b/src/installer/hw.c
> index 894b887d9..a196bf8be 100644
> --- a/src/installer/hw.c
> +++ b/src/installer/hw.c
> @@ -822,6 +822,10 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {
> } else if (fs == HW_FS_XFS) {
> snprintf(cmd, sizeof(cmd), "/sbin/mkfs.xfs -f %s", path);
> 
> + // BTRFS
> + } else if (fs == HW_FS_BTRFS) {
> + snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -L rootfs -f %s", path);
> +

Is this label required here? The other filesystems don’t use a label.

> // FAT32
> } else if (fs == HW_FS_FAT32) {
> snprintf(cmd, sizeof(cmd), "/sbin/mkfs.vfat %s", path);
> @@ -882,6 +886,10 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
> filesystem = "xfs";
> break;
> 
> + case HW_FS_BTRFS:
> + filesystem = "btrfs";
> + break;
> +
> case HW_FS_FAT32:
> filesystem = "vfat";
> break;
> diff --git a/src/installer/hw.h b/src/installer/hw.h
> index 6a7f23aa7..e5ee65a6d 100644
> --- a/src/installer/hw.h
> +++ b/src/installer/hw.h
> @@ -46,6 +46,7 @@
> #define HW_FS_EXT4_WO_JOURNAL         2
> #define HW_FS_XFS                     3
> #define HW_FS_FAT32                   4
> +#define HW_FS_BTRFS                   5
> 
> #define HW_FS_DEFAULT                 HW_FS_EXT4
> 
> diff --git a/src/installer/main.c b/src/installer/main.c
> index cddb0d91a..b3c9d27ee 100644
> --- a/src/installer/main.c
> +++ b/src/installer/main.c
> @@ -720,6 +720,7 @@ int main(int argc, char *argv[]) {
> { HW_FS_EXT4,            _("ext4 Filesystem") },
> { HW_FS_EXT4_WO_JOURNAL, _("ext4 Filesystem without journal") },
> { HW_FS_XFS,             _("XFS Filesystem") },
> + { HW_FS_BTRFS,           _("BTRFS Filesystem") },

Can we please add an “(EXPERIMENTAL)” here to signal to users that this is currently an experimental feature?

> { 0, NULL },
> };
> unsigned int num_filesystems = sizeof(filesystems) / sizeof(*filesystems);
> -- 
> 2.39.2
>
diff mbox series

Patch

diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
index 26a257cf8..09564f885 100755
--- a/src/installer/dracut-module/module-setup.sh
+++ b/src/installer/dracut-module/module-setup.sh
@@ -30,8 +30,8 @@  install() {
     instmods virtio_net hv_netvsc vmxnet3
 
     # Filesystem support
-    inst_multiple parted mkswap mke2fs mkfs.xfs mkfs.vfat
-    instmods ext4 iso9660 vfat xfs ntfs3
+    inst_multiple parted mkswap mke2fs mkfs.xfs mkfs.vfat mkfs.btrfs
+    instmods ext4 iso9660 vfat xfs ntfs3 btrfs
 
     # Extraction
     inst_multiple tar gzip zstd
diff --git a/src/installer/hw.c b/src/installer/hw.c
index 894b887d9..a196bf8be 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -822,6 +822,10 @@  static int hw_format_filesystem(const char* path, int fs, const char* output) {
 	} else if (fs == HW_FS_XFS) {
 		snprintf(cmd, sizeof(cmd), "/sbin/mkfs.xfs -f %s", path);
 
+	// BTRFS
+	} else if (fs == HW_FS_BTRFS) {
+		snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -L rootfs -f %s", path);
+
 	// FAT32
 	} else if (fs == HW_FS_FAT32) {
 		snprintf(cmd, sizeof(cmd), "/sbin/mkfs.vfat %s", path);
@@ -882,6 +886,10 @@  int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
 			filesystem = "xfs";
 			break;
 
+		case HW_FS_BTRFS:
+			filesystem = "btrfs";
+			break;
+
 		case HW_FS_FAT32:
 			filesystem = "vfat";
 			break;
diff --git a/src/installer/hw.h b/src/installer/hw.h
index 6a7f23aa7..e5ee65a6d 100644
--- a/src/installer/hw.h
+++ b/src/installer/hw.h
@@ -46,6 +46,7 @@ 
 #define HW_FS_EXT4_WO_JOURNAL         2
 #define HW_FS_XFS                     3
 #define HW_FS_FAT32                   4
+#define HW_FS_BTRFS                   5
 
 #define HW_FS_DEFAULT                 HW_FS_EXT4
 
diff --git a/src/installer/main.c b/src/installer/main.c
index cddb0d91a..b3c9d27ee 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -720,6 +720,7 @@  int main(int argc, char *argv[]) {
 			{ HW_FS_EXT4,            _("ext4 Filesystem") },
 			{ HW_FS_EXT4_WO_JOURNAL, _("ext4 Filesystem without journal") },
 			{ HW_FS_XFS,             _("XFS Filesystem") },
+			{ HW_FS_BTRFS,           _("BTRFS Filesystem") },
 			{ 0, NULL },
 		};
 		unsigned int num_filesystems = sizeof(filesystems) / sizeof(*filesystems);