Merge pull request #474 from nix-community/fix/generate-hardware-config

fix: `--generate-hardware-config` doesn't work with non-existent folders

Author: Enzime

src/nixos-anywhere.sh

@@ -201,7 +201,7 @@ parseArgs() {
         abort "Unknown hardware config backend: $2"
         ;;
       esac
-      hardwareConfigPath="$(realpath "$3")"
+      hardwareConfigPath=$3
       shift
       shift
       ;;
@@ -569,6 +569,8 @@ generateHardwareConfig() {
 
   # to make sure nix knows about the new file
   if command -v git >/dev/null; then
+    # handle relative paths
+    hardwareConfigPath="$(realpath "$hardwareConfigPath")"
     pushd "$(dirname "$hardwareConfigPath")"
     if git rev-parse --is-inside-work-tree >/dev/null; then
       git add --intent-to-add --force -- "$hardwareConfigPath"

tests/from-nixos-generate-config.nix

@@ -16,6 +16,7 @@
   };
   testScript = ''
     start_all()
+    installer.fail("test -f /tmp/hw/config.nix")
     installer.succeed("echo super-secret > /tmp/disk-1.key")
     output = installer.succeed("""
       nixos-anywhere \
@@ -25,7 +26,7 @@
         --disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
         --disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \
         --phases kexec,disko \
-        --generate-hardware-config nixos-generate-config /tmp/config.nix \
+        --generate-hardware-config nixos-generate-config /tmp/hw/config.nix \
         --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
         root@installed >&2
       echo "disk-1.key: '$(ssh -i /root/.ssh/install_key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
@@ -34,12 +35,14 @@
         root@installed cat /tmp/disk-2.key)'"
     """)
 
-    installer.succeed("cat /tmp/config.nix >&2")
-    installer.succeed("nix-instantiate --parse /tmp/config.nix")
+    installer.succeed("cat /tmp/hw/config.nix >&2")
+    installer.succeed("nix-instantiate --parse /tmp/hw/config.nix")
 
     assert "disk-1.key: 'super-secret'" in output, f"output does not contain expected values: {output}"
     assert "disk-2.key: 'another-secret'" in output, f"output does not contain expected values: {output}"
 
+    installer.fail("test -f /test/hw/config.json")
+
     output = installer.succeed("""
       nixos-anywhere \
         -i /root/.ssh/install_key \
@@ -48,7 +51,7 @@
         --disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
         --disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \
         --phases kexec,disko \
-        --generate-hardware-config nixos-facter /tmp/config.json \
+        --generate-hardware-config nixos-facter /tmp/hw/config.json \
         --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
         installed >&2
       echo "disk-1.key: '$(ssh -i /root/.ssh/install_key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
@@ -57,8 +60,8 @@
         root@installed cat /tmp/disk-2.key)'"
     """)
 
-    installer.succeed("cat /tmp/config.json >&2")
-    installer.succeed("jq < /tmp/config.json")
+    installer.succeed("cat /tmp/hw/config.json >&2")
+    installer.succeed("jq < /tmp/hw/config.json")
 
     assert "disk-1.key: 'super-secret'" in output, f"output does not contain expected values: {output}"
     assert "disk-2.key: 'another-secret'" in output, f"output does not contain expected values: {output}"