Fix 3474 (#3476)
* Fix 3474 - Parse mountpoint correctly * Fix 3474 - Parse mountpoint correctly * Update
This commit is contained in:
parent
f7f6b27a8a
commit
790a7a2be9
|
|
@ -314,8 +314,7 @@ class ArchConfigHandler:
|
||||||
type=str,
|
type=str,
|
||||||
)
|
)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"--mount-point",
|
"--mountpoint",
|
||||||
"--mount_point",
|
|
||||||
type=Path,
|
type=Path,
|
||||||
nargs="?",
|
nargs="?",
|
||||||
default=Path("/mnt"),
|
default=Path("/mnt"),
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@ def perform_installation(mountpoint: Path) -> None:
|
||||||
locale_config = config.locale_config
|
locale_config = config.locale_config
|
||||||
disk_encryption = config.disk_encryption
|
disk_encryption = config.disk_encryption
|
||||||
optional_repositories = config.mirror_config.optional_repositories if config.mirror_config else []
|
optional_repositories = config.mirror_config.optional_repositories if config.mirror_config else []
|
||||||
|
mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint
|
||||||
|
|
||||||
with Installer(
|
with Installer(
|
||||||
mountpoint,
|
mountpoint,
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ def perform_installation(mountpoint: Path) -> None:
|
||||||
|
|
||||||
disk_config = config.disk_config
|
disk_config = config.disk_config
|
||||||
disk_encryption = config.disk_encryption
|
disk_encryption = config.disk_encryption
|
||||||
|
mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint
|
||||||
|
|
||||||
with Installer(
|
with Installer(
|
||||||
mountpoint,
|
mountpoint,
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ def perform_installation(mountpoint: Path) -> None:
|
||||||
|
|
||||||
disk_config = config.disk_config
|
disk_config = config.disk_config
|
||||||
disk_encryption = config.disk_encryption
|
disk_encryption = config.disk_encryption
|
||||||
|
mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint
|
||||||
|
|
||||||
with Installer(
|
with Installer(
|
||||||
mountpoint,
|
mountpoint,
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,7 @@ def perform_installation(mountpoint: Path) -> None:
|
||||||
locale_config = config.locale_config
|
locale_config = config.locale_config
|
||||||
disk_encryption = config.disk_encryption
|
disk_encryption = config.disk_encryption
|
||||||
optional_repositories = config.mirror_config.optional_repositories if config.mirror_config else []
|
optional_repositories = config.mirror_config.optional_repositories if config.mirror_config else []
|
||||||
|
mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint
|
||||||
|
|
||||||
with Installer(
|
with Installer(
|
||||||
mountpoint,
|
mountpoint,
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ def perform_installation(mountpoint: Path) -> None:
|
||||||
return
|
return
|
||||||
|
|
||||||
disk_encryption = config.disk_encryption
|
disk_encryption = config.disk_encryption
|
||||||
|
mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint
|
||||||
|
|
||||||
with Installer(
|
with Installer(
|
||||||
mountpoint,
|
mountpoint,
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ def perform_installation(mountpoint: Path) -> None:
|
||||||
|
|
||||||
disk_config = config.disk_config
|
disk_config = config.disk_config
|
||||||
disk_encryption = config.disk_encryption
|
disk_encryption = config.disk_encryption
|
||||||
|
mountpoint = disk_config.mountpoint if disk_config.mountpoint else mountpoint
|
||||||
|
|
||||||
with Installer(
|
with Installer(
|
||||||
mountpoint,
|
mountpoint,
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ def test_correct_parsing_args(
|
||||||
str(creds_fixture),
|
str(creds_fixture),
|
||||||
"--script",
|
"--script",
|
||||||
"execution_script",
|
"execution_script",
|
||||||
"--mount-point",
|
"--mountpoint",
|
||||||
"/tmp",
|
"/tmp",
|
||||||
"--skip-ntp",
|
"--skip-ntp",
|
||||||
"--debug",
|
"--debug",
|
||||||
|
|
@ -85,7 +85,7 @@ def test_correct_parsing_args(
|
||||||
silent=True,
|
silent=True,
|
||||||
dry_run=True,
|
dry_run=True,
|
||||||
script="execution_script",
|
script="execution_script",
|
||||||
mountpoint=Path("/mnt"),
|
mountpoint=Path("/tmp"),
|
||||||
skip_ntp=True,
|
skip_ntp=True,
|
||||||
debug=True,
|
debug=True,
|
||||||
offline=True,
|
offline=True,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue