RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix null fs_type of partition (#2458) (#2459)

This commit is contained in:
Hao Xiang 2024-04-16 18:56:44 +08:00 committed by GitHub
parent 5aa616e70d
commit 8f5bc523db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/disk/device_model.py
View File

@ -114,7 +114,7 @@ class DiskLayoutConfiguration:
for partition in entry.get('partitions', []): for partition in entry.get('partitions', []):
device_partition = PartitionModification( device_partition = PartitionModification(
status=ModificationStatus(partition['status']), status=ModificationStatus(partition['status']),
fs_type=FilesystemType(partition['fs_type']), fs_type=FilesystemType(partition['fs_type']) if partition.get('fs_type') else None,
start=Size.parse_args(partition['start']), start=Size.parse_args(partition['start']),
length=Size.parse_args(partition['size']), length=Size.parse_args(partition['size']),
mount_options=partition['mount_options'], mount_options=partition['mount_options'],
@ -663,7 +663,7 @@ class PartitionModification:
type: PartitionType type: PartitionType
start: Size start: Size
length: Size length: Size
fs_type: Optional[FilesystemType] fs_type: Optional[FilesystemType] = None
mountpoint: Optional[Path] = None mountpoint: Optional[Path] = None
mount_options: List[str] = field(default_factory=list) mount_options: List[str] = field(default_factory=list)
flags: List[PartitionFlag] = field(default_factory=list) flags: List[PartitionFlag] = field(default_factory=list)
@ -815,7 +815,7 @@ class PartitionModification:
'type': self.type.value, 'type': self.type.value,
'start': self.start.json(), 'start': self.start.json(),
'size': self.length.json(), 'size': self.length.json(),
'fs_type': self.fs_type.value if self.fs_type else '', 'fs_type': self.fs_type.value if self.fs_type else None,
'mountpoint': str(self.mountpoint) if self.mountpoint else None, 'mountpoint': str(self.mountpoint) if self.mountpoint else None,
'mount_options': self.mount_options, 'mount_options': self.mount_options,
'flags': [f.name for f in self.flags], 'flags': [f.name for f in self.flags],