]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - src/installer/hw.c
installer: Pass choosen filesystem to hw_make_destination
[ipfire-2.x.git] / src / installer / hw.c
index 77789e35e6e09408da008caecad0d99956297205..46330ce431b972183fd7c32a84a75780208aede6 100644 (file)
@@ -631,9 +631,13 @@ static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* de
        return 0;
 }
 
-struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks, int disable_swap) {
+struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks,
+               int disable_swap, int filesystem) {
        struct hw_destination* dest = malloc(sizeof(*dest));
 
+       // Assign filesystem
+       dest->filesystem = filesystem;
+
        if (part_type == HW_PART_TYPE_NORMAL) {
                dest->disk1 = *disks;
                dest->disk2 = NULL;
@@ -655,9 +659,6 @@ struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct
        if (r)
                return NULL;
 
-       // Set default filesystem
-       dest->filesystem = HW_FS_DEFAULT;
-
        return dest;
 }