Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions archinstall/lib/disk/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,12 @@ def perform_filesystem_operations(self, show_countdown: bool = True) -> None:
for mod in device_mods:
if boot_part := mod.get_boot_partition():
debug(f'Formatting boot partition: {boot_part.dev_path}')
self._format_partitions(
[boot_part],
mod.device_path,
)
self._format_partitions([boot_part])

self.perform_lvm_operations()
else:
for mod in device_mods:
self._format_partitions(
mod.partitions,
mod.device_path,
)
self._format_partitions(mod.partitions)

for part_mod in mod.partitions:
if part_mod.fs_type == FilesystemType.Btrfs and part_mod.is_create_or_modify():
Expand All @@ -83,7 +77,6 @@ def perform_filesystem_operations(self, show_countdown: bool = True) -> None:
def _format_partitions(
self,
partitions: list[PartitionModification],
device_path: Path,
) -> None:
"""
Format can be given an overriding path, for instance /dev/null to test
Expand Down
1 change: 0 additions & 1 deletion archinstall/lib/models/device_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def parse_arg(
cls,
disk_config: _DiskLayoutConfigurationSerialization,
enc_password: Password | None = None,
disk_encryption: _DiskEncryptionSerialization | None = None,
) -> DiskLayoutConfiguration | None:
from archinstall.lib.disk.device_handler import device_handler

Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/models/mirrors.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def validate_score(cls, value: float) -> int | None:
return value

@model_validator(mode='after')
def debug_output(self, validation_info) -> 'MirrorStatusEntryV3':
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

def debug_output(self) -> 'MirrorStatusEntryV3':
self._hostname, *port = urllib.parse.urlparse(self.url).netloc.split(':', 1)
self._port = int(port[0]) if port and len(port) >= 1 else None

Expand Down
3 changes: 1 addition & 2 deletions archinstall/tui/curses_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def add_frame(

# adjust the original rows and cols of the entries as
# they need to be shrunk by 1 to make space for the frame
entries = self._adjust_entries(entries, dim)
entries = self._adjust_entries(entries)

framed_entries = [
top_ve,
Expand Down Expand Up @@ -242,7 +242,6 @@ def _get_frame_dim(
def _adjust_entries(
self,
entries: list[ViewportEntry],
frame_dim: FrameDim,
) -> list[ViewportEntry]:
for entry in entries:
# top row frame offset
Expand Down