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

Fix master merge conflicts from LVM branch (#2463)

This commit is contained in:
Daniel Girtler 2024-04-16 22:06:03 +10:00 committed by GitHub
parent db798eec71
commit cd587792e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1429,8 +1429,7 @@ def _clean_field(name: str, clean_type: CleanType) -> str:
def _fetch_lsblk_info( def _fetch_lsblk_info(
dev_path: Optional[Union[Path, str]] = None, dev_path: Optional[Union[Path, str]] = None,
reverse: bool = False, reverse: bool = False,
full_dev_path: bool = False, full_dev_path: bool = False
retry: int = 3
) -> List[LsblkInfo]: ) -> List[LsblkInfo]:
fields = [_clean_field(f, CleanType.Lsblk) for f in LsblkInfo.fields()] fields = [_clean_field(f, CleanType.Lsblk) for f in LsblkInfo.fields()]
cmd = ['lsblk', '--json', '--bytes', '--output', '+' + ','.join(fields)] cmd = ['lsblk', '--json', '--bytes', '--output', '+' + ','.join(fields)]