From mboxrd@z Thu Jan 1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] installer: Remove the option to install without journal
Date: Sat, 14 Dec 2024 12:05:46 +0000
Message-ID: <20241214120547.863221-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4850392453976100462=="
List-Id: <development.lists.ipfire.org>
--===============4850392453976100462==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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(a)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 =3D=3D HW_FS_EXT4) {
snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
=20
- // EXT4 w/o journal
- } else if (fs =3D=3D HW_FS_EXT4_WO_JOURNAL) {
- snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", =
path);
-
// XFS
} else if (fs =3D=3D 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, c=
onst char* prefix) {
const char* filesystem;
switch (dest->filesystem) {
case HW_FS_EXT4:
- case HW_FS_EXT4_WO_JOURNAL:
filesystem =3D "ext4";
break;
=20
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 @@
=20
#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
=20
#define HW_FS_DEFAULT HW_FS_EXT4
=20
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[] =3D {
{ 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 },
--=20
2.39.5
--===============4850392453976100462==--