ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-03 17:33:26 +03:00
Code Issues Projects Releases Wiki Activity

* Fix networking in the installer test.

Browse Source 
* If connecting to the host fails in the guest, then shutdown
  immediately.

svn path=/nixos/branches/boot-order/; revision=22341
This commit is contained in:
Eelco Dolstra 2010-06-20 15:33:44 +00:00
parent 411139148d
commit 20a88efffa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/test-driver/Machine.pm
View File

@ -28,7 +28,7 @@ sub new {
# !!! merge with qemu-vm.nix. # !!! merge with qemu-vm.nix.
$startCommand = $startCommand =
"qemu-system-x86_64 -m 384 " . "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 " $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
if defined $args->{hda}; if defined $args->{hda};
$startCommand .= "-cdrom $args->{cdrom} " $startCommand .= "-cdrom $args->{cdrom} "

7
modules/testing/test-instrumentation.nix
View File

@ -24,7 +24,8 @@ in
config = { config = {
jobs.backdoor = jobs.backdoor =
{ startOn = "started network-interfaces"; { startOn = "ip-up";
stopOn = "never";
script = script =
'' ''
@ -35,8 +36,10 @@ in
source /etc/profile source /etc/profile
cd /tmp cd /tmp
echo "connecting to host..." > /dev/ttyS0 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 = boot.postBootCommands =