Author: eelco Date: 2010-06-20 15:33:44 +0000 (Sun, 20 Jun 2010) New Revision: 22341
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22341&view=rev Modified: nixos/branches/boot-order/lib/test-driver/Machine.pm nixos/branches/boot-order/modules/testing/test-instrumentation.nix Log: * Fix networking in the installer test. * If connecting to the host fails in the guest, then shutdown immediately. Changes: Modified: nixos/branches/boot-order/lib/test-driver/Machine.pm =================================================================== --- nixos/branches/boot-order/lib/test-driver/Machine.pm 2010-06-20 12:54:42 UTC (rev 22340) +++ nixos/branches/boot-order/lib/test-driver/Machine.pm 2010-06-20 15:33:44 UTC (rev 22341) @@ -28,7 +28,7 @@ # !!! merge with qemu-vm.nix. $startCommand = "qemu-system-x86_64 -m 384 " . - "-net nic,model=virtio -net user \$QEMU_OPTS "; + "-net nic,model=virtio -net user,\$QEMU_NET_OPTS \$QEMU_OPTS "; $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report " if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " Modified: nixos/branches/boot-order/modules/testing/test-instrumentation.nix =================================================================== --- nixos/branches/boot-order/modules/testing/test-instrumentation.nix 2010-06-20 12:54:42 UTC (rev 22340) +++ nixos/branches/boot-order/modules/testing/test-instrumentation.nix 2010-06-20 15:33:44 UTC (rev 22341) @@ -24,7 +24,8 @@ config = { jobs.backdoor = - { startOn = "started network-interfaces"; + { startOn = "ip-up"; + stopOn = "never"; script = '' @@ -35,10 +36,12 @@ source /etc/profile cd /tmp echo "connecting to host..." > /dev/ttyS0 - exec ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0 + ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0 || poweroff -f ''; + + respawn = false; }; - + boot.postBootCommands = '' # Panic on out-of-memory conditions rather than letting the _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
