webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Remove the option to install without journal

Browse Source 
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>
This commit is contained in:
Michael Tremer
2024-12-14 12:05:46 +00:00
parent f2fce26932
commit ca81c65144
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/installer/hw.c
View File

@@ -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;

7
src/installer/hw.h
View File

@@ -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

1
src/installer/main.c
View File

@@ -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 },