Skip to content

Commit 9492010

Browse files
committed
Add constant for archiso mountpoint
1 parent 37159dc commit 9492010

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

archinstall/lib/disk/device_handler.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
)
3737
from archinstall.lib.models.users import Password
3838
from archinstall.lib.output import debug, error, info, log
39+
from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT
3940

4041

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

65-
archiso_mountpoint = Path('/run/archiso/airootfs')
66-
6766
for device in devices:
6867
dev_lsblk_info = find_lsblk_info(device.path, all_lsblk_info)
6968

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

7776
# exclude archiso loop device
78-
if dev_lsblk_info.mountpoint == archiso_mountpoint:
77+
if dev_lsblk_info.mountpoint == ARCHISO_MOUNTPOINT:
7978
continue
8079

8180
try:

archinstall/lib/pathnames.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
from pathlib import Path
12
from typing import Final
23

34
from archinstall.lib.linux_path import LPath
45

6+
ARCHISO_MOUNTPOINT: Final = Path('/run/archiso/airootfs')
57
PACMAN_CONF: Final = LPath('/etc/pacman.conf')

archinstall/lib/utils/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from pathlib import Path
44

55
from archinstall.lib.output import FormattedOutput
6+
from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT
67

78

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

1718

1819
def generate_password(length: int = 64) -> str:

0 commit comments

Comments
 (0)