Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archinstall/lib/disk/device_handler.py18
-rw-r--r--archinstall/lib/disk/device_model.py42
2 files changed, 22 insertions, 38 deletions
diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
index c06247e6..6e91ac2e 100644
--- a/archinstall/lib/disk/device_handler.py
+++ b/archinstall/lib/disk/device_handler.py
@@ -2,7 +2,6 @@ from __future__ import annotations
import json
import os
-import time
import logging
from pathlib import Path
from typing import List, Dict, Any, Optional, TYPE_CHECKING
@@ -316,6 +315,9 @@ class DeviceHandler(object):
else:
self._perform_formatting(part_mod.safe_fs_type, part_mod.safe_dev_path)
+ # synchronize with udev before using lsblk
+ SysCommand('udevadm settle')
+
lsblk_info = self._fetch_part_info(part_mod.safe_dev_path)
part_mod.partn = lsblk_info.partn
@@ -384,19 +386,7 @@ class DeviceHandler(object):
part_mod.dev_path = Path(partition.path)
def _fetch_part_info(self, path: Path) -> LsblkInfo:
- attempts = 3
- lsblk_info: Optional[LsblkInfo] = None
-
- for attempt_nr in range(attempts):
- time.sleep(attempt_nr + 1)
- lsblk_info = get_lsblk_info(path)
-
- if lsblk_info.partn and lsblk_info.partuuid and lsblk_info.uuid:
- break
-
- if not lsblk_info:
- debug(f'Unable to get partition information: {path}')
- raise DiskError(f'Unable to get partition information: {path}')
+ lsblk_info = get_lsblk_info(path)
if not lsblk_info.partn:
debug(f'Unable to determine new partition number: {path}\n{lsblk_info}')
diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py
index 423c65e4..fe96203c 100644
--- a/archinstall/lib/disk/device_model.py
+++ b/archinstall/lib/disk/device_model.py
@@ -3,7 +3,6 @@ from __future__ import annotations
import dataclasses
import json
import math
-import time
import uuid
from dataclasses import dataclass, field
from enum import Enum
@@ -1103,39 +1102,34 @@ def _clean_field(name: str, clean_type: CleanType) -> str:
return name.replace('_percentage', '%').replace('_', '-')
-def _fetch_lsblk_info(dev_path: Optional[Union[Path, str]] = None, retry: int = 3) -> List[LsblkInfo]:
+def _fetch_lsblk_info(dev_path: Optional[Union[Path, str]] = None) -> List[LsblkInfo]:
fields = [_clean_field(f, CleanType.Lsblk) for f in LsblkInfo.fields()]
- lsblk_fields = ','.join(fields)
-
- if not dev_path:
- dev_path = ''
-
- for retry_attempt in range(retry + 1):
- try:
- result = SysCommand(f'lsblk --json -b -o+{lsblk_fields} {dev_path}').decode()
- break
- except SysCallError as err:
- # Get the output minus the message/info from lsblk if it returns a non-zero exit code.
- if err.worker:
- err_str = err.worker.decode()
- debug(f'Error calling lsblk: {err_str}')
- else:
- raise err
+ cmd = ['lsblk', '--json', '--bytes', '--output', '+' + ','.join(fields)]
+
+ if dev_path:
+ cmd.append(str(dev_path))
- if retry_attempt == retry:
- raise err
+ try:
+ result = SysCommand(cmd).decode()
+ except SysCallError as err:
+ # Get the output minus the message/info from lsblk if it returns a non-zero exit code.
+ if err.worker:
+ err_str = err.worker.decode()
+ debug(f'Error calling lsblk: {err_str}')
- time.sleep(1)
+ if dev_path:
+ raise DiskError(f'Failed to read disk "{dev_path}" with lsblk')
+
+ raise err
try:
block_devices = json.loads(result)
- blockdevices = block_devices['blockdevices']
- return [LsblkInfo.from_json(device) for device in blockdevices]
except json.decoder.JSONDecodeError as err:
error(f"Could not decode lsblk JSON: {result}")
raise err
- raise DiskError(f'Failed to read disk "{dev_path}" with lsblk')
+ blockdevices = block_devices['blockdevices']
+ return [LsblkInfo.from_json(device) for device in blockdevices]
def get_lsblk_info(dev_path: Union[Path, str]) -> LsblkInfo: