From 04b43f1e3f1a7eb2b80898ca4a6ad4908e1967bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Jan 2011 15:40:46 +0000 Subject: [PATCH] * Remove tabs because this causes the shell script to be misindented. svn path=/nixos/trunk/; revision=25522 --- modules/virtualisation/qemu-vm.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix index 494dfa52fb19..0490d530f9e3 100644 --- a/modules/virtualisation/qemu-vm.nix +++ b/modules/virtualisation/qemu-vm.nix @@ -171,12 +171,12 @@ let ${pkgs.lib.optionalString cfg.useBackdoor '' # Create a shell socket file to which the VM can connect and create in the - # current working directory a socket file which can be used to remotely access - # the VM through the shell interface + # current working directory a socket file which can be used to remotely access + # the VM through the shell interface ${pkgs.socat}/bin/socat UNIX-LISTEN:./shell UNIX-LISTEN:$WORKDIR/${vmName}.socket,fork & - - while [ ! -e ./shell ]; do sleep 0.1; done # Wait until the socket file is there + + while [ ! -e ./shell ]; do sleep 0.1; done # Wait until the socket file is there ''} # Start QEMU. @@ -186,7 +186,7 @@ let -net nic,vlan=0,model=virtio \ -chardev socket,id=samba,path=./samba \ -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba${if cfg.useBackdoor then ",guestfwd=tcp:10.0.2.6:23-chardev:shell" else ""}''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \ - ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \ + ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \ ${if cfg.useBootLoader then '' -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \