From 59e205dffdc44a47374c3ea1357b8a6da7ca4cf7 Mon Sep 17 00:00:00 2001 From: Muhammad Salman Date: Thu, 1 Aug 2024 10:51:58 +0500 Subject: [PATCH 1/3] feat[#293]: Add "Do not format" toggle for /var partition in manual partitioning --- vanilla_installer/defaults/disk.py | 2 +- vanilla_installer/utils/processor.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vanilla_installer/defaults/disk.py b/vanilla_installer/defaults/disk.py index 7d0e0fb0..e6ea1421 100644 --- a/vanilla_installer/defaults/disk.py +++ b/vanilla_installer/defaults/disk.py @@ -64,7 +64,7 @@ class PartitionRow(Adw.ActionRow): __siblings: list - __partition_fs_types = ["btrfs", "ext4", "ext3", "fat32", "xfs"] + __partition_fs_types = ["unformatted", "btrfs", "ext4", "ext3", "fat32", "xfs"] def __init__(self, page, parent, partition, modifiable, default_fs, **kwargs): super().__init__(**kwargs) diff --git a/vanilla_installer/utils/processor.py b/vanilla_installer/utils/processor.py index 9bd3b0ee..c4d73182 100644 --- a/vanilla_installer/utils/processor.py +++ b/vanilla_installer/utils/processor.py @@ -335,6 +335,9 @@ def setup_partition( ): mountpoints.append([part, values["mp"]]) if values["fs"] == "unformatted": + operation = "namepart" + format_args = [part_number, part_name] + setup_steps.append([part_disk, operation, format_args]) return format_args = [part_number, values["fs"]] if encrypt: From e72c49f450ade510658dfa53ceb4283ebfb204cc Mon Sep 17 00:00:00 2001 From: Muhammad Salman Date: Thu, 15 Aug 2024 06:50:19 +0000 Subject: [PATCH 2/3] Set the filesystem label as 'vos-var' rather than partition label --- vanilla_installer/utils/processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vanilla_installer/utils/processor.py b/vanilla_installer/utils/processor.py index a0928394..664e296e 100644 --- a/vanilla_installer/utils/processor.py +++ b/vanilla_installer/utils/processor.py @@ -335,7 +335,7 @@ def setup_partition( ): mountpoints.append([part, values["mp"]]) if values["fs"] == "unformatted": - operation = "namepart" + operation = "setlabel" format_args = [part_number, part_name] setup_steps.append([part_disk, operation, format_args]) return From 844dc5b1cd5b9c513eba9695f1074200e1aa93ca Mon Sep 17 00:00:00 2001 From: Muhammad Salman Date: Thu, 15 Aug 2024 08:24:30 +0000 Subject: [PATCH 3/3] check if the partition has a supported filesystem on it --- vanilla_installer/defaults/disk.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vanilla_installer/defaults/disk.py b/vanilla_installer/defaults/disk.py index da3e5701..7fb0bc64 100644 --- a/vanilla_installer/defaults/disk.py +++ b/vanilla_installer/defaults/disk.py @@ -64,7 +64,7 @@ class PartitionRow(Adw.ActionRow): __siblings: list - __partition_fs_types = ["unformatted", "btrfs", "ext4", "ext3", "fat32", "xfs"] + __partition_fs_types = ["btrfs", "ext4", "ext3", "fat32", "xfs"] def __init__(self, page, parent, partition, modifiable, default_fs, **kwargs): super().__init__(**kwargs) @@ -83,7 +83,10 @@ def __init__(self, page, parent, partition, modifiable, default_fs, **kwargs): self.__add_dropdown() def __add_dropdown(self): - fs_dropdown = Gtk.DropDown.new_from_strings(self.__partition_fs_types) + if self.__partition.fs_type in self.__partition_fs_types: + fs_dropdown = Gtk.DropDown.new_from_strings(["unformatted"] + self.__partition_fs_types) + else: + fs_dropdown = Gtk.DropDown.new_from_strings(self.__partition_fs_types) fs_dropdown.set_valign(Gtk.Align.CENTER) fs_dropdown.set_visible(False)