Merge pull request #487 from r-vdp/rvdp/install_bootloader

feat: add a flag to reinstall the bootloader

Author: Mic92

terraform/all-in-one/main.tf

@@ -56,6 +56,7 @@ module "nixos-rebuild" {
   target_host = var.target_host
   target_user = var.target_user
   target_port = var.target_port
+  install_bootloader = var.install_bootloader
 }
 
 output "result" {

terraform/all-in-one/variables.tf

@@ -143,3 +143,9 @@ variable "build_on_remote" {
   description = "Build the closure on the remote machine instead of building it locally and copying it over"
   default     = false
 }
+
+variable "install_bootloader" {
+  type = bool
+  description = "Install/re-install the bootloader"
+  default = false
+}

terraform/nixos-rebuild/deploy.sh

@@ -3,7 +3,7 @@
 set -uex -o pipefail
 
 if [ "$#" -ne 5 ]; then
-  echo "USAGE: $0 NIXOS_SYSTEM TARGET_USER TARGET_HOST TARGET_PORT IGNORE_SYSTEMD_ERRORS" >&2
+  echo "USAGE: $0 NIXOS_SYSTEM TARGET_USER TARGET_HOST TARGET_PORT IGNORE_SYSTEMD_ERRORS INSTALL_BOOTLOADER" >&2
   exit 1
 fi
 
@@ -12,7 +12,9 @@ TARGET_USER=$2
 TARGET_HOST=$3
 TARGET_PORT=$4
 IGNORE_SYSTEMD_ERRORS=$5
-shift 3
+INSTALL_BOOTLOADER=$6
+
+shift 6
 
 TARGET="${TARGET_USER}@${TARGET_HOST}"
 
@@ -46,7 +48,14 @@ until NIX_SSHOPTS="${sshOpts[*]}" nix copy -s --experimental-features nix-comman
   try=$((try + 1))
 done
 
-switchCommand="nix-env -p /nix/var/nix/profiles/system --set $(printf "%q" "$NIXOS_SYSTEM"); /nix/var/nix/profiles/system/bin/switch-to-configuration switch"
+if [[ $INSTALL_BOOTLOADER == "true" ]]; then
+  extra_env='NIXOS_INSTALL_BOOTLOADER=1'
+else
+  extra_env=''
+fi
+
+switchCommand="nix-env -p /nix/var/nix/profiles/system --set $(printf "%q" "$NIXOS_SYSTEM"); $extra_env /nix/var/nix/profiles/system/bin/switch-to-configuration switch"
+
 if [[ $TARGET_USER != "root" ]]; then
   switchCommand="sudo bash -c '$switchCommand'"
 fi

terraform/nixos-rebuild/main.tf

@@ -6,6 +6,6 @@ resource "null_resource" "nixos-rebuild" {
     environment = {
       SSH_KEY = var.ssh_private_key
     }
-    command = "${path.module}/deploy.sh ${var.nixos_system} ${var.target_user} ${var.target_host} ${var.target_port} ${var.ignore_systemd_errors}"
+    command = "${path.module}/deploy.sh ${var.nixos_system} ${var.target_user} ${var.target_host} ${var.target_port} ${var.ignore_systemd_errors} ${var.install_bootloader}"
   }
 }

terraform/nixos-rebuild/variables.tf

@@ -31,3 +31,9 @@ variable "ignore_systemd_errors" {
   description = "Ignore systemd errors happening during deploy"
   default = false
 }
+
+variable "install_bootloader" {
+  type = bool
+  description = "Install/re-install the bootloader"
+  default = false
+}