diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py index 027b0518b6..286c90a817 100644 --- a/archinstall/lib/args.py +++ b/archinstall/lib/args.py @@ -314,8 +314,7 @@ def _define_arguments(self) -> ArgumentParser: type=str, ) parser.add_argument( - "--mount-point", - "--mount_point", + "--mountpoint", type=Path, nargs="?", default=Path("/mnt"), diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py index 9172df0d5a..2066169feb 100644 --- a/archinstall/scripts/guided.py +++ b/archinstall/scripts/guided.py @@ -55,6 +55,7 @@ def perform_installation(mountpoint: Path) -> None: locale_config = config.locale_config disk_encryption = config.disk_encryption optional_repositories = config.mirror_config.optional_repositories if config.mirror_config else [] + mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint with Installer( mountpoint, diff --git a/archinstall/scripts/minimal.py b/archinstall/scripts/minimal.py index d30296d9ee..c420a97f6a 100644 --- a/archinstall/scripts/minimal.py +++ b/archinstall/scripts/minimal.py @@ -24,6 +24,7 @@ def perform_installation(mountpoint: Path) -> None: disk_config = config.disk_config disk_encryption = config.disk_encryption + mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint with Installer( mountpoint, diff --git a/archinstall/scripts/only_hd.py b/archinstall/scripts/only_hd.py index bcb66a2bdd..1253e933d2 100644 --- a/archinstall/scripts/only_hd.py +++ b/archinstall/scripts/only_hd.py @@ -38,6 +38,7 @@ def perform_installation(mountpoint: Path) -> None: disk_config = config.disk_config disk_encryption = config.disk_encryption + mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint with Installer( mountpoint, diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py index 08d66bd46d..3e6baacdb6 100644 --- a/examples/interactive_installation.py +++ b/examples/interactive_installation.py @@ -54,6 +54,7 @@ def perform_installation(mountpoint: Path) -> None: locale_config = config.locale_config disk_encryption = config.disk_encryption optional_repositories = config.mirror_config.optional_repositories if config.mirror_config else [] + mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint with Installer( mountpoint, diff --git a/examples/minimal_installation.py b/examples/minimal_installation.py index bff70311d0..1b4dd3f601 100644 --- a/examples/minimal_installation.py +++ b/examples/minimal_installation.py @@ -25,6 +25,7 @@ def perform_installation(mountpoint: Path) -> None: return disk_encryption = config.disk_encryption + mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint with Installer( mountpoint, diff --git a/examples/only_hd_installation.py b/examples/only_hd_installation.py index 624da7b31d..15918758c2 100644 --- a/examples/only_hd_installation.py +++ b/examples/only_hd_installation.py @@ -38,6 +38,7 @@ def perform_installation(mountpoint: Path) -> None: disk_config = config.disk_config disk_encryption = config.disk_encryption + mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint with Installer( mountpoint, diff --git a/tests/test_args.py b/tests/test_args.py index 35f2b0ea45..650260f0fd 100644 --- a/tests/test_args.py +++ b/tests/test_args.py @@ -60,7 +60,7 @@ def test_correct_parsing_args( str(creds_fixture), "--script", "execution_script", - "--mount-point", + "--mountpoint", "/tmp", "--skip-ntp", "--debug", @@ -85,7 +85,7 @@ def test_correct_parsing_args( silent=True, dry_run=True, script="execution_script", - mountpoint=Path("/mnt"), + mountpoint=Path("/tmp"), skip_ntp=True, debug=True, offline=True,