diff mbox series

[1/2] installer: Remove the option to install without journal

Message ID 20241214120547.863221-1-michael.tremer@ipfire.org
State Accepted
Commit ca81c65144e64a54937a00bf79f7a51e80bc6d97
Headers
Series [1/2] installer: Remove the option to install without journal |

Commit Message

Michael Tremer Dec. 14, 2024, 12:05 p.m. UTC 
  It was possible to install a new system without a journal. I think this
is a very outdated concept now and should be avoided in favour of
filesystem integrity.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/installer/hw.c   | 5 -----
 src/installer/hw.h   | 7 +++----
 src/installer/main.c | 1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

Comments

Adolf Belka Dec. 14, 2024, 12:57 p.m. UTC | #1 
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

On 14/12/2024 13:05, Michael Tremer wrote:
> It was possible to install a new system without a journal. I think this
> is a very outdated concept now and should be avoided in favour of
> filesystem integrity.
>
> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>   src/installer/hw.c   | 5 -----
>   src/installer/hw.h   | 7 +++----
>   src/installer/main.c | 1 -
>   3 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/src/installer/hw.c b/src/installer/hw.c
> index 6bf05b185..577780af9 100644
> --- a/src/installer/hw.c
> +++ b/src/installer/hw.c
> @@ -923,10 +923,6 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {
>   	} else if (fs == HW_FS_EXT4) {
>   		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
>   
> -	// EXT4 w/o journal
> -	} else if (fs == HW_FS_EXT4_WO_JOURNAL) {
> -		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path);
> -
>   	// XFS
>   	} else if (fs == HW_FS_XFS) {
>   		snprintf(cmd, sizeof(cmd), "/sbin/mkfs.xfs -f %s", path);
> @@ -1027,7 +1023,6 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
>   	const char* filesystem;
>   	switch (dest->filesystem) {
>   		case HW_FS_EXT4:
> -		case HW_FS_EXT4_WO_JOURNAL:
>   			filesystem = "ext4";
>   			break;
>   
> diff --git a/src/installer/hw.h b/src/installer/hw.h
> index 92f32b67f..e1c3d345f 100644
> --- a/src/installer/hw.h
> +++ b/src/installer/hw.h
> @@ -43,10 +43,9 @@
>   
>   #define HW_FS_SWAP                    0
>   #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_BTRFS                   5
> +#define HW_FS_XFS                     2
> +#define HW_FS_FAT32                   3
> +#define HW_FS_BTRFS                   4
>   
>   #define HW_FS_DEFAULT                 HW_FS_EXT4
>   
> diff --git a/src/installer/main.c b/src/installer/main.c
> index 9e3f4af83..9b9c630c3 100644
> --- a/src/installer/main.c
> +++ b/src/installer/main.c
> @@ -644,7 +644,6 @@ int main(int argc, char *argv[]) {
>   			char* description;
>   		} filesystems[] = {
>   			{ HW_FS_EXT4,            _("ext4 Filesystem") },
> -			{ HW_FS_EXT4_WO_JOURNAL, _("ext4 Filesystem without journal") },
>   			{ HW_FS_XFS,             _("XFS Filesystem") },
>   			{ HW_FS_BTRFS,           _("BTRFS Filesystem (EXPERIMENTAL)") },
>   			{ 0, NULL },
diff mbox series

Patch

diff --git a/src/installer/hw.c b/src/installer/hw.c
index 6bf05b185..577780af9 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -923,10 +923,6 @@  static int hw_format_filesystem(const char* path, int fs, const char* output) {
 	} else if (fs == HW_FS_EXT4) {
 		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
 
-	// EXT4 w/o journal
-	} else if (fs == HW_FS_EXT4_WO_JOURNAL) {
-		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path);
-
 	// XFS
 	} else if (fs == HW_FS_XFS) {
 		snprintf(cmd, sizeof(cmd), "/sbin/mkfs.xfs -f %s", path);
@@ -1027,7 +1023,6 @@  int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
 	const char* filesystem;
 	switch (dest->filesystem) {
 		case HW_FS_EXT4:
-		case HW_FS_EXT4_WO_JOURNAL:
 			filesystem = "ext4";
 			break;
 
diff --git a/src/installer/hw.h b/src/installer/hw.h
index 92f32b67f..e1c3d345f 100644
--- a/src/installer/hw.h
+++ b/src/installer/hw.h
@@ -43,10 +43,9 @@ 
 
 #define HW_FS_SWAP                    0
 #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_BTRFS                   5
+#define HW_FS_XFS                     2
+#define HW_FS_FAT32                   3
+#define HW_FS_BTRFS                   4
 
 #define HW_FS_DEFAULT                 HW_FS_EXT4
 
diff --git a/src/installer/main.c b/src/installer/main.c
index 9e3f4af83..9b9c630c3 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -644,7 +644,6 @@  int main(int argc, char *argv[]) {
 			char* description;
 		} filesystems[] = {
 			{ HW_FS_EXT4,            _("ext4 Filesystem") },
-			{ HW_FS_EXT4_WO_JOURNAL, _("ext4 Filesystem without journal") },
 			{ HW_FS_XFS,             _("XFS Filesystem") },
 			{ HW_FS_BTRFS,           _("BTRFS Filesystem (EXPERIMENTAL)") },
 			{ 0, NULL },