Skip to content

Move mount() to disk.utils #4232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
svartkanin merged 1 commit into from
Feb 16, 2026
+50 −49
Merged

Move mount() to disk.utils #4232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 4 additions & 40 deletions archinstall/lib/disk/device_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
find_lsblk_info,
get_all_lsblk_info,
get_lsblk_info,
mount,
umount,
)

Expand Down Expand Up @@ -218,7 +219,7 @@ def get_btrfs_info(
subvol_infos: list[_BtrfsSubvolumeInfo] = []

if not lsblk_info.mountpoint:
self.mount(dev_path, self._TMP_BTRFS_MOUNT, create_target_mountpoint=True)
mount(dev_path, self._TMP_BTRFS_MOUNT, create_target_mountpoint=True)
mountpoint = self._TMP_BTRFS_MOUNT
else:
# when multiple subvolumes are mounted then the lsblk output may look like
Expand Down Expand Up @@ -622,7 +623,7 @@ def create_lvm_btrfs_subvolumes(
) -> None:
info(f'Creating subvolumes: {path}')

self.mount(path, self._TMP_BTRFS_MOUNT, create_target_mountpoint=True)
mount(path, self._TMP_BTRFS_MOUNT, create_target_mountpoint=True)

for sub_vol in sorted(btrfs_subvols, key=lambda x: x.name):
debug(f'Creating subvolume: {sub_vol.name}')
Expand Down Expand Up @@ -671,7 +672,7 @@ def create_btrfs_volumes(
luks_handler = None
dev_path = part_mod.safe_dev_path

self.mount(
mount(
dev_path,
self._TMP_BTRFS_MOUNT,
create_target_mountpoint=True,
Expand Down Expand Up @@ -769,43 +770,6 @@ def swapon(path: Path) -> None:
except SysCallError as err:
raise DiskError(f'Could not enable swap {path}:\n{err.message}')

def mount(
self,
dev_path: Path,
target_mountpoint: Path,
mount_fs: str | None = None,
create_target_mountpoint: bool = True,
options: list[str] = [],
) -> None:
if create_target_mountpoint and not target_mountpoint.exists():
target_mountpoint.mkdir(parents=True, exist_ok=True)

if not target_mountpoint.exists():
raise ValueError('Target mountpoint does not exist')

lsblk_info = get_lsblk_info(dev_path)
if target_mountpoint in lsblk_info.mountpoints:
info(f'Device already mounted at {target_mountpoint}')
return

cmd = ['mount']

if len(options):
cmd.extend(('-o', ','.join(options)))
if mount_fs:
cmd.extend(('-t', mount_fs))

cmd.extend((str(dev_path), str(target_mountpoint)))

command = ' '.join(cmd)

debug(f'Mounting {dev_path}: {command}')

try:
SysCommand(command)
except SysCallError as err:
raise DiskError(f'Could not mount {dev_path}: {command}\n{err.message}')

def detect_pre_mounted_mods(self, base_mountpoint: Path) -> list[DeviceModification]:
part_mods: dict[Path, list[PartitionModification]] = {}

Expand Down
43 changes: 40 additions & 3 deletions archinstall/lib/disk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from archinstall.lib.command import SysCommand
from archinstall.lib.exceptions import DiskError, SysCallError
from archinstall.lib.models.device import LsblkInfo
from archinstall.lib.output import debug, warn
from archinstall.lib.output import debug, info, warn


class LsblkOutput(BaseModel):
Expand Down Expand Up @@ -67,12 +67,12 @@ def get_lsblk_output() -> LsblkOutput:

def find_lsblk_info(
dev_path: Path | str,
info: list[LsblkInfo],
info_list: list[LsblkInfo],
Copy link
Contributor Author

@codefiles codefiles Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would seem like an unrelated change but with info being added to the imports just above this, pylint will give the following:
https://pylint.pycqa.org/en/latest/user_guide/messages/warning/redefined-outer-name.html

) -> LsblkInfo | None:
if isinstance(dev_path, str):
dev_path = Path(dev_path)

for lsblk_info in info:
for lsblk_info in info_list:
if lsblk_info.path == dev_path:
return lsblk_info

Expand Down Expand Up @@ -110,6 +110,43 @@ def disk_layouts() -> str:
return lsblk_output.model_dump_json(indent=4)


def mount(
dev_path: Path,
target_mountpoint: Path,
mount_fs: str | None = None,
create_target_mountpoint: bool = True,
options: list[str] = [],
) -> None:
if create_target_mountpoint and not target_mountpoint.exists():
target_mountpoint.mkdir(parents=True, exist_ok=True)

if not target_mountpoint.exists():
raise ValueError('Target mountpoint does not exist')

lsblk_info = get_lsblk_info(dev_path)
if target_mountpoint in lsblk_info.mountpoints:
info(f'Device already mounted at {target_mountpoint}')
return

cmd = ['mount']

if len(options):
cmd.extend(('-o', ','.join(options)))
if mount_fs:
cmd.extend(('-t', mount_fs))

cmd.extend((str(dev_path), str(target_mountpoint)))

command = ' '.join(cmd)

debug(f'Mounting {dev_path}: {command}')

try:
SysCommand(command)
except SysCallError as err:
raise DiskError(f'Could not mount {dev_path}: {command}\n{err.message}')


def umount(mountpoint: Path, recursive: bool = False) -> None:
lsblk_info = get_lsblk_info(mountpoint)

Expand Down
12 changes: 6 additions & 6 deletions archinstall/lib/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from archinstall.lib.disk.device_handler import device_handler
from archinstall.lib.disk.fido import Fido2
from archinstall.lib.disk.utils import get_lsblk_by_mountpoint, get_lsblk_info
from archinstall.lib.disk.utils import get_lsblk_by_mountpoint, get_lsblk_info, mount
from archinstall.lib.models.application import ZramAlgorithm
from archinstall.lib.models.device import (
DiskEncryption,
Expand Down Expand Up @@ -360,7 +360,7 @@ def _mount_partition(self, part_mod: PartitionModification) -> None:
# it would be none if it's btrfs as the subvolumes will have the mountpoints defined
if part_mod.mountpoint:
target = self.target / part_mod.relative_mountpoint
device_handler.mount(part_mod.dev_path, target, options=part_mod.mount_options)
mount(part_mod.dev_path, target, options=part_mod.mount_options)
elif part_mod.fs_type == FilesystemType.Btrfs:
# Only mount BTRFS subvolumes that have mountpoints specified
subvols_with_mountpoints = [sv for sv in part_mod.btrfs_subvols if sv.mountpoint is not None]
Expand All @@ -377,7 +377,7 @@ def _mount_lvm_vol(self, volume: LvmVolume) -> None:
if volume.fs_type != FilesystemType.Btrfs:
if volume.mountpoint and volume.dev_path:
target = self.target / volume.relative_mountpoint
device_handler.mount(volume.dev_path, target, options=volume.mount_options)
mount(volume.dev_path, target, options=volume.mount_options)

if volume.fs_type == FilesystemType.Btrfs and volume.dev_path:
# Only mount BTRFS subvolumes that have mountpoints specified
Expand All @@ -396,13 +396,13 @@ def _mount_luks_partition(self, part_mod: PartitionModification, luks_handler: L
self._mount_btrfs_subvol(luks_handler.mapper_dev, part_mod.btrfs_subvols, part_mod.mount_options)
elif part_mod.mountpoint:
target = self.target / part_mod.relative_mountpoint
device_handler.mount(luks_handler.mapper_dev, target, options=part_mod.mount_options)
mount(luks_handler.mapper_dev, target, options=part_mod.mount_options)

def _mount_luks_volume(self, volume: LvmVolume, luks_handler: Luks2) -> None:
if volume.fs_type != FilesystemType.Btrfs:
if volume.mountpoint and luks_handler.mapper_dev:
target = self.target / volume.relative_mountpoint
device_handler.mount(luks_handler.mapper_dev, target, options=volume.mount_options)
mount(luks_handler.mapper_dev, target, options=volume.mount_options)

if volume.fs_type == FilesystemType.Btrfs and luks_handler.mapper_dev:
# Only mount BTRFS subvolumes that have mountpoints specified
Expand All @@ -421,7 +421,7 @@ def _mount_btrfs_subvol(
for subvol in sorted(subvols_with_mountpoints, key=lambda x: x.relative_mountpoint):
mountpoint = self.target / subvol.relative_mountpoint
options = mount_options + [f'subvol={subvol.name}']
device_handler.mount(dev_path, mountpoint, options=options)
mount(dev_path, mountpoint, options=options)

def generate_key_files(self) -> None:
match self._disk_encryption.encryption_type:
Expand Down