summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-02-19 19:35:40 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2022-02-19 19:43:34 +0100
commit1659bca6b715b6bf6c141c165e9a33dbc75a074a (patch)
tree61c4eec880096bd29e75a2043c1329f1a4f82d26 /nixos
parent9234f7fbb501a5f3ccd09ffc40db407a2f4a5485 (diff)
downloadnixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.tar
nixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.tar.gz
nixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.tar.bz2
nixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.tar.lz
nixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.tar.xz
nixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.tar.zst
nixpkgs-1659bca6b715b6bf6c141c165e9a33dbc75a074a.zip
nixos-build-vms(8): `$out/bin/nixos-run-vms` should non-interactively start VMs
Not entirely sure when it got broken this time, but when creating a VM
network with `nixos-build-vms(8)`, there are should be the following scripts:

* `$out/bin/nixos-test-driver` which drops into an interactive shell to
  interactively perform test steps.
* `$out/bin/nixos-run-vms` which non-interactively starts the VMs from
  the network so that one can manually play around in the VM.

The latter also starts an interactive shell for a while now which means
that it does the exact same thing as `nixos-test-driver` which is not
its purpose.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/tools/nixos-build-vms/build-vms.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index 8aedce2fb49..b4a94f62ad9 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -25,4 +25,7 @@ pkgs.runCommand "nixos-build-vms" { nativeBuildInputs = [ pkgs.makeWrapper ]; }
   ln -s ${interactiveDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
   wrapProgram $out/bin/nixos-test-driver \
     --add-flags "--interactive"
+  wrapProgram $out/bin/nixos-run-vms \
+     --set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \
+     --add-flags "--no-interactive"
 ''