diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-03-13 13:40:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 13:40:33 +0000 |
| commit | bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7 (patch) | |
| tree | c1c1dacd71a2457d0659fc19089a0da7ab7af36f /nixos/modules | |
| parent | d9d21b67345c3be39fa8dd0de7781618e86ac338 (diff) | |
| parent | c476d2f592f5fc4ccca10da4d8f45c7d15eb8c5a (diff) | |
| download | nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.tar nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.tar.gz nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.tar.bz2 nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.tar.lz nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.tar.xz nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.tar.zst nixlib-bfbc4951a6cad4b2c355cf8f3db1f1eccbd1f1a7.zip | |
Merge pull request #36850 from teto/virtualisation
Virtualisation
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 9ede74a54cd7..2af73519bc52 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -382,6 +382,6 @@ fi if [ "$action" = build-vm ]; then cat >&2 <<EOF -Done. The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm). +Done. The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm) EOF fi diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index cc03e54ead63..8bd203106f55 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -182,7 +182,7 @@ sub GrubFs { # Based on the type pull in the identifier from the system my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); if ($status != 0) { - die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}"; + die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; } my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; if ($#matches != 0) { diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 13d0eb7de5c2..3270f1507f9a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -319,8 +319,8 @@ in networkingOptions = mkOption { default = [ - "-net nic,vlan=0,model=virtio" - "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" ]; type = types.listOf types.str; description = '' @@ -436,7 +436,7 @@ in # FIXME: Figure out how to make this work on non-x86 virtualisation.qemu.options = - mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usbdevice tablet" ]; + mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]; # Mount the host filesystem via 9P, and bind-mount the Nix store # of the host into our own filesystem. We use mkVMOverride to |