Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Girtler <girtler.daniel@gmail.com>2024-04-16 22:06:03 +1000
committerGitHub <noreply@github.com>2024-04-16 14:06:03 +0200
commitcd587792e1e8f429f2dcd3c8e9f745d80cb28f38 (patch)
treec46f9d3305710308e9dbfb37c3247be02e55023d
parentdb798eec717a58538cffb712a6689434333dbd82 (diff)
Fix master merge conflicts from LVM branch (#2463)
-rw-r--r--archinstall/lib/disk/device_model.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py
index 50de3ebc..7edaa5b6 100644
--- a/archinstall/lib/disk/device_model.py
+++ b/archinstall/lib/disk/device_model.py
@@ -1429,8 +1429,7 @@ def _clean_field(name: str, clean_type: CleanType) -> str:
def _fetch_lsblk_info(
dev_path: Optional[Union[Path, str]] = None,
reverse: bool = False,
- full_dev_path: bool = False,
- retry: int = 3
+ full_dev_path: bool = False
) -> List[LsblkInfo]:
fields = [_clean_field(f, CleanType.Lsblk) for f in LsblkInfo.fields()]
cmd = ['lsblk', '--json', '--bytes', '--output', '+' + ','.join(fields)]