From 790a7a2be9128c81927e655ff191e6a59c91162c Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Mon, 19 May 2025 18:59:42 +1000 Subject: [PATCH] Fix 3474 (#3476) * Fix 3474 - Parse mountpoint correctly * Fix 3474 - Parse mountpoint correctly * Update --- archinstall/lib/args.py | 3 +-- archinstall/scripts/guided.py | 1 + archinstall/scripts/minimal.py | 1 + archinstall/scripts/only_hd.py | 1 + examples/interactive_installation.py | 1 + examples/minimal_installation.py | 1 + examples/only_hd_installation.py | 1 + tests/test_args.py | 4 ++-- 8 files changed, 9 insertions(+), 4 deletions(-) diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py index 027b0518..286c90a8 100644 --- a/archinstall/lib/args.py +++ b/archinstall/lib/args.py @@ -314,8 +314,7 @@ class ArchConfigHandler: 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 9172df0d..2066169f 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 d30296d9..c420a97f 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 bcb66a2b..1253e933 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 08d66bd4..3e6baacd 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 bff70311..1b4dd3f6 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 624da7b3..15918758 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 35f2b0ea..650260f0 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,