Skip to content

Commit abbe975

Browse files
Mic92mergify[bot]
authored andcommitted
terraform: add missing phases
1 parent d5ced5d commit abbe975

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

terraform/all-in-one/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ variable "no_reboot" {
8989

9090
variable "phases" {
9191
type = set(string)
92-
description = "Phases to run"
92+
description = "Phases to run. See `nixos-anywhere --help` for more information"
9393
default = ["kexec", "disko", "install", "reboot"]
9494
}
9595

terraform/install/run-nixos-anywhere.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,9 @@ if [[ ${input[debug_logging]} == "true" ]]; then
1616
declare -p input
1717
args+=("--debug")
1818
fi
19-
if [[ ${input[stop_after_disko]} == "true" ]]; then
20-
args+=("--stop-after-disko")
21-
fi
2219
if [[ ${input[kexec_tarball_url]} != "null" ]]; then
2320
args+=("--kexec" "${input[kexec_tarball_url]}")
2421
fi
25-
if [[ ${input[no_reboot]} == "true" ]]; then
26-
args+=("--no-reboot")
27-
fi
2822
if [[ ${input[build_on_remote]} == "true" ]]; then
2923
args+=("--build-on-remote")
3024
fi
@@ -36,6 +30,7 @@ fi
3630
if [[ -n ${SSHPASS-} ]]; then
3731
args+=("--env-password")
3832
fi
33+
args+=(--phases "${input[phases]}")
3934

4035
tmpdir=$(mktemp -d)
4136
cleanup() {

terraform/install/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ variable "no_reboot" {
9494

9595
variable "phases" {
9696
type = list(string)
97-
description = "Phases to run"
97+
description = "Phases to run. See `nixos-anywhere --help` for more information"
9898
default = ["kexec", "disko", "install", "reboot"]
9999
}
100100

0 commit comments

Comments
 (0)