From 43fe431cce107bd311a68dea59ac0f672ac13615 Mon Sep 17 00:00:00 2001 From: David Craven Date: Tue, 14 Feb 2017 16:28:31 +0100 Subject: vm: Remove hard coded kernel file name. * gnu/system/vm.scm (system-qemu-image/shared-store-script, expression->derivation-in-linux-vm): Use operating-system-kernel-file and system-linux-image-file-name. * gnu/system.scm (system-linux-image-file-name): Add ARM. --- gnu/system/vm.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 8a35f7fbc5..a7203d1690 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -141,7 +141,8 @@ made available under the /xchg CIFS share." (gnu build vm)) (let ((inputs '#$(list qemu coreutils)) - (linux (string-append #$linux "/bzImage")) + (linux (string-append #$linux "/" + #$(system-linux-image-file-name))) (initrd (string-append #$initrd "/initrd")) (loader #$loader) (graphs '#$(match references-graphs @@ -487,7 +488,7 @@ exec " #$qemu "/bin/" #$(qemu-command (%current-system)) #$@(if full-boot? #~() - #~(" -kernel " #$(operating-system-kernel os) "/bzImage \ + #~(" -kernel " #$(operating-system-kernel-file os) " \ -initrd " #$os-drv "/initrd \ -append \"" #$(if graphic? "" "console=ttyS0 ") "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1 " -- cgit v1.2.3