installer: Force overwriting EXT4 FS

[ipfire-2.x.git] / src / installer / hw.c

diff --git a/src/installer/hw.c b/src/installer/hw.c
index ce9777500d5cbd28ecabdb10082f7fbd04760841..362be4779f14119e2582fe04eb6c4ecb367ce011 100644 (file)
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -322,6 +322,9 @@ struct hw_disk** hw_find_disks(struct hw* hw, const char* sourcedrive) {
                                "%s - %s", size_str, p);
                }
 
+               // Cut off the description string after 40 characters
+               disk->description[41] = '\0';
+
                *disks++ = disk;
 
                if (--i == 0)
@@ -744,11 +747,11 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {
 
        // EXT4
        } else if (fs == HW_FS_EXT4) {
-               snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 %s", path);
+               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 -T ext4 -O ^has_journal %s", path);
+               snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path);
 
        // XFS
        } else if (fs == HW_FS_XFS) {