@@ -16,11 +16,6 @@ let
17 qemu = config.system.build.qemu or pkgs.qemu_test;
17 qemu = config.system.build.qemu or pkgs.qemu_test;
20− if config.networking.hostName == ""
22− else config.networking.hostName;
24 cfg = config.virtualisation;
19 cfg = config.virtualisation;
26 consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
21 consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
@@ -156,7 +151,7 @@ let
157 # Start QEMU.
152 # Start QEMU.
158 exec ${qemuBinary qemu} \
153 exec ${qemuBinary qemu} \
159− -name ${vmName} \
154+ -name ${config.system.name} \
160 -m ${toString config.virtualisation.memorySize} \
155 -m ${toString config.virtualisation.memorySize} \
161 -smp ${toString config.virtualisation.cores} \
156 -smp ${toString config.virtualisation.cores} \
162 -device virtio-rng-pci \
157 -device virtio-rng-pci \
@@ -294,7 +289,7 @@ in
295 virtualisation.diskImage =
290 virtualisation.diskImage =
296 mkOption {
291 mkOption {
297− default = "./${vmName}.qcow2";
292+ default = "./${config.system.name}.qcow2";
298 description =
293 description =
300 Path to the disk image containing the root filesystem.
295 Path to the disk image containing the root filesystem.
@@ -712,7 +707,7 @@ in
713 mkdir -p $out/bin
708 mkdir -p $out/bin
714 ln -s ${config.system.build.toplevel} $out/system
709 ln -s ${config.system.build.toplevel} $out/system
715− ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
710+ ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm
718 # When building a regular system configuration, override whatever
713 # When building a regular system configuration, override whatever