installer: Allow to install IPFire on BTRFS

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
index 26a257cf89e38ce9f932f1cbffbf2df4065fc3d5..09564f885cc12dbb5eade59d48f92e5929d2b19a 100755 (executable)
--- 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 894b887d905886476a1b6cf8532d80d9d13dbcf9..a196bf8bed7c70bdd1812c801ce18c86253fb80e 100644 (file)
--- 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 6a7f23aa7c03caf3f0049b4d1401c7dcb80d790c..e5ee65a6d2a7f706aa3d982c2dea6f26daec673b 100644 (file)
--- 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 cddb0d91a6fc2e2ab69a69ebd6050197ec05de40..b3c9d27eed848b15e63572358ae23cb978ec5396 100644 (file)
--- 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);