installer: Remove support for ReiserFS

https://lore.kernel.org/lkml/YhIwUEpymVzmytdp@casper.infradead.org/

ReiserFS is an old file system which has not been actively maintained in
the Linux kernel for a long time. It is potentially going to be removed
soon which is why we shouldn't encourage people to create new
installations with ReiserFS any more.

This patch removes support for ReiserFS from the installer.

We should keep it enabled in the kernel for as long as it is available,
but we will have to encourage users potentially to re-install on a
different file system.

Since ReiserFS isn't very popular any more, I don't think that there
will be many users left.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
index c68b51d260c6d2d8c07e7b795b8f69f940f9c666..26a257cf89e38ce9f932f1cbffbf2df4065fc3d5 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 mkreiserfs mkfs.xfs mkfs.vfat
-    instmods ext4 iso9660 reiserfs vfat xfs ntfs3
+    inst_multiple parted mkswap mke2fs mkfs.xfs mkfs.vfat
+    instmods ext4 iso9660 vfat xfs ntfs3
 
     # Extraction
     inst_multiple tar gzip zstd

diff --git a/src/installer/hw.c b/src/installer/hw.c
index 5cba2a261a81c55aafdb7d5eb696a6111f2c4e73..12f8e793de49b65afb4d271f10d6d7717e8a8145 100644 (file)
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -811,9 +811,6 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {
        // Swap
        if (fs == HW_FS_SWAP) {
                snprintf(cmd, sizeof(cmd), "/sbin/mkswap -v1 %s &>/dev/null", path);
-       // ReiserFS
-       } else if (fs == HW_FS_REISERFS) {
-               snprintf(cmd, sizeof(cmd), "/sbin/mkreiserfs -f %s ", path);
 
        // EXT4
        } else if (fs == HW_FS_EXT4) {
@@ -878,10 +875,6 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
 
        const char* filesystem;
        switch (dest->filesystem) {
-               case HW_FS_REISERFS:
-                       filesystem = "reiserfs";
-                       break;
-
                case HW_FS_EXT4:
                case HW_FS_EXT4_WO_JOURNAL:
                        filesystem = "ext4";

diff --git a/src/installer/hw.h b/src/installer/hw.h
index b11dfa48f345cbf6ad9ad418cbf58fe649102b24..6a7f23aa7c03caf3f0049b4d1401c7dcb80d790c 100644 (file)
--- a/src/installer/hw.h
+++ b/src/installer/hw.h
@@ -42,11 +42,10 @@
 #define HW_PART_TABLE_GPT             1
 
 #define HW_FS_SWAP                    0
-#define HW_FS_REISERFS                1
-#define HW_FS_EXT4                    2
-#define HW_FS_EXT4_WO_JOURNAL         3
-#define HW_FS_XFS                     4
-#define HW_FS_FAT32                   5
+#define HW_FS_EXT4                    1
+#define HW_FS_EXT4_WO_JOURNAL         2
+#define HW_FS_XFS                     3
+#define HW_FS_FAT32                   4
 
 #define HW_FS_DEFAULT                 HW_FS_EXT4
 

diff --git a/src/installer/main.c b/src/installer/main.c
index b31b096a54a26770bb4c7d6f9a9069cd215e6e64..06dd9caf5cd0ec73b43ea34b01887fcb8f8e555a 100644 (file)
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -720,7 +720,6 @@ 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_REISERFS,        _("ReiserFS Filesystem") },
                        { 0, NULL },
                };
                unsigned int num_filesystems = sizeof(filesystems) / sizeof(*filesystems);
@@ -735,7 +734,7 @@ int main(int argc, char *argv[]) {
                }
 
                rc = newtWinMenu(_("Filesystem Selection"), _("Please choose your filesystem:"),
-                       50, 5, 5, 6, fs_names, &fs_choice, _("OK"), _("Cancel"), NULL);
+                       50, 5, 5, 5, fs_names, &fs_choice, _("OK"), _("Cancel"), NULL);
 
                if (rc == 2)
                        goto EXIT;