Skip to content

Refactor ISO check #4264

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 28, 2026
Merged

Refactor ISO check #4264

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
4 changes: 2 additions & 2 deletions archinstall/lib/locale/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from archinstall.lib.command import SysCommand
from archinstall.lib.exceptions import ServiceException, SysCallError
from archinstall.lib.output import error
from archinstall.lib.utils.util import running_from_host
from archinstall.lib.utils.util import running_from_iso


def list_keyboard_languages() -> list[str]:
Expand Down Expand Up @@ -80,7 +80,7 @@ def get_kb_layout() -> str:


def set_kb_layout(locale: str) -> bool:
if running_from_host():
if not running_from_iso():
# Skip when running from host - no need to change host keymap
# The target installation keymap is set via installer.set_keyboard_language()
return True
Expand Down
11 changes: 5 additions & 6 deletions archinstall/lib/utils/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
from archinstall.lib.output import FormattedOutput


def running_from_host() -> bool:
def running_from_iso() -> bool:
"""
Check if running from an installed system.
Check if running from the archiso environment.

Returns True if running from installed system (host mode) for host-to-target install.
Returns False if /run/archiso exists (ISO mode).
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.
"""
is_host = not Path('/run/archiso').exists()
return is_host
return Path('/run/archiso/airootfs').is_mount()


def generate_password(length: int = 64) -> str:
Expand Down
9 changes: 4 additions & 5 deletions archinstall/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from archinstall.lib.packages.util import check_version_upgrade
from archinstall.lib.pacman.pacman import Pacman
from archinstall.lib.translationhandler import tr
from archinstall.lib.utils.util import running_from_host
from archinstall.lib.utils.util import running_from_iso


def _log_sys_info() -> None:
Expand Down Expand Up @@ -114,11 +114,10 @@ def run() -> int:
info(text)
time.sleep(3)

if running_from_host():
# log which mode we are using
debug('Running from Host (H2T Mode)...')
else:
if running_from_iso():
debug('Running from ISO (Live Mode)...')
else:
debug('Running from Host (H2T Mode)...')

mod_name = f'archinstall.scripts.{script}'
# by loading the module we'll automatically run the script
Expand Down