From ff2b64187fa6b85f4406c6da24414fb24f504832 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 2 Mar 2022 18:56:11 +0000 Subject: [PATCH] installer: Remove support for ReiserFS Signed-off-by: Michael Tremer --- src/installer/dracut-module/module-setup.sh | 4 ++-- src/installer/hw.c | 7 ------- src/installer/hw.h | 9 ++++----- src/installer/main.c | 3 +-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh index c68b51d260..26a257cf89 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 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 17e0bbb01e..5aa162266e 100644 --- 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 b11dfa48f3..6a7f23aa7c 100644 --- 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 b31b096a54..06dd9caf5c 100644 --- 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; -- 2.39.5