Skip to content

Fix 3474 #3476

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
Torxed merged 3 commits into from
May 19, 2025
Merged

Fix 3474 #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
489eeac
Fix 3474 - Parse mountpoint correctly
svartkanin May 18, 2025
599c8ca
Fix 3474 - Parse mountpoint correctly
svartkanin May 18, 2025
dc5e2db
Update
svartkanin May 18, 2025
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
3 changes: 1 addition & 2 deletions archinstall/lib/args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
1 change: 1 addition & 0 deletions archinstall/scripts/guided.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions archinstall/scripts/minimal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions archinstall/scripts/only_hd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions examples/interactive_installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions examples/minimal_installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions examples/only_hd_installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def test_correct_parsing_args(
str(creds_fixture),
"--script",
"execution_script",
"--mount-point",
"--mountpoint",
"/tmp",
"--skip-ntp",
"--debug",
Expand All @@ -85,7 +85,7 @@ def test_correct_parsing_args(
silent=True,
dry_run=True,
script="execution_script",
mountpoint=Path("/mnt"),
mountpoint=Path("/tmp"),
Copy link
Copy Markdown
Member

@Torxed Torxed May 19, 2025

Choose a reason for hiding this comment

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

Why doesn't /mnt work here?

Copy link
Copy Markdown
Collaborator Author

@svartkanin svartkanin May 19, 2025

Choose a reason for hiding this comment

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

Because the test data uses /tmp above. The arg parser was broken and defaulting to /mnt that's why the test was fine

skip_ntp=True,
debug=True,
offline=True,
Expand Down