diff options
| author | Shea Levy <shea@shealevy.com> | 2012-12-17 13:03:56 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-12-17 13:03:56 -0500 |
| commit | 75ec5c609e6618df34b494f767ef11771a8ce122 (patch) | |
| tree | 72abe6401d286eccdf78ed8191ef2d5d7c3a98b6 /modules/virtualisation | |
| parent | 835ee30b327b18c75a90870fed15f910d9d8e615 (diff) | |
| parent | 358239348aea0f076069fcd60e94aa0610fe777f (diff) | |
| download | nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.tar nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.tar.gz nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.tar.bz2 nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.tar.lz nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.tar.xz nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.tar.zst nixlib-75ec5c609e6618df34b494f767ef11771a8ce122.zip | |
Merge remote-tracking branch 'upstream/master' into systemd
Conflicts: maintainers/scripts/ec2/create-ebs-amis.py
Diffstat (limited to 'modules/virtualisation')
| -rw-r--r-- | modules/virtualisation/qemu-vm.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix index 0367379b2444..b35b311819a8 100644 --- a/modules/virtualisation/qemu-vm.nix +++ b/modules/virtualisation/qemu-vm.nix @@ -166,6 +166,7 @@ let ${pkgs.vmTools.startSamba} # Start QEMU. + # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd. exec ${pkgs.qemu_kvm}/bin/qemu-kvm \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ @@ -174,8 +175,9 @@ let -chardev socket,id=samba,path=./samba \ -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \ ${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,readonly \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ + -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \ + -boot menu=on '' else '' -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ |