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
5 changes: 2 additions & 3 deletions archinstall/lib/disk/device_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
)
from archinstall.lib.models.users import Password
from archinstall.lib.output import debug, error, info, log
from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT


class DeviceHandler:
Expand All @@ -62,8 +63,6 @@ def load_devices(self) -> None:
devices = getAllDevices()
devices.extend(self.get_loop_devices())

archiso_mountpoint = Path('/run/archiso/airootfs')

for device in devices:
dev_lsblk_info = find_lsblk_info(device.path, all_lsblk_info)

Expand All @@ -75,7 +74,7 @@ def load_devices(self) -> None:
continue

# exclude archiso loop device
if dev_lsblk_info.mountpoint == archiso_mountpoint:
if dev_lsblk_info.mountpoint == ARCHISO_MOUNTPOINT:
continue

try:
Expand Down
2 changes: 2 additions & 0 deletions archinstall/lib/pathnames.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from pathlib import Path
from typing import Final

from archinstall.lib.linux_path import LPath

ARCHISO_MOUNTPOINT: Final = Path('/run/archiso/airootfs')
PACMAN_CONF: Final = LPath('/etc/pacman.conf')
4 changes: 2 additions & 2 deletions archinstall/lib/utils/util.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import secrets
import string
from pathlib import Path

from archinstall.lib.output import FormattedOutput
from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT


def running_from_iso() -> bool:
Expand All @@ -12,7 +12,7 @@ def running_from_iso() -> bool:
Returns True if /run/archiso/airootfs is a mount point (ISO mode).
Returns False if running from installed system (host mode) for host-to-target install.
"""
return Path('/run/archiso/airootfs').is_mount()
return ARCHISO_MOUNTPOINT.is_mount()


def generate_password(length: int = 64) -> str:
Expand Down
Loading