From 0e704a2d4ea9b65cde79240f4433296645c5a220 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 27 Nov 2014 23:59:26 +0100 Subject: linux-boot: Load modules and their dependencies, à la 'modprobe'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/linux-boot.scm: Use (gnu build linux-modules). (load-linux-module*): Remove. (boot-system): Add #:linux-module-directory parameter. [lookup-module]: New procedure. Call 'current-module-debugging-port'. Pass #:lookup-module to 'load-linux-module*'. Map LOOKUP-MODULE on LINUX-MODULES. * gnu/system/linux-initrd.scm (base-initrd): Adjust 'boot-system' call accordingly. Adjust #:modules argument as well. * gnu/system.scm (operating-system-activation-script)[%modules]: Likewise. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise. --- gnu/system/vm.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/system/vm.scm') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 07b13deeca..33ca396eb9 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -104,7 +104,9 @@ (define* (expression->derivation-in-linux-vm name exp '((gnu build vm) (gnu build install) (gnu build linux-boot) + (gnu build linux-modules) (gnu build file-systems) + (guix elf) (guix build utils) (guix build store-copy))) (guile-for-build -- cgit v1.2.3 From 5c5e7bdafd38e2bed2c4e0b0f64fefb16855aded Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Dec 2014 17:18:05 +0100 Subject: vm: Use QEMU's standard VGA emulation by default. * gnu/system/vm.scm (common-qemu-options): Add "-vga std". --- gnu/system/vm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system/vm.scm') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 33ca396eb9..4374256530 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -472,7 +472,7 @@ (define (virtfs-option fs) " -enable-kvm -no-reboot -net nic,model=virtio \ " #$@(map virtfs-option shared-fs) " \ -net user \ - -serial stdio \ + -serial stdio -vga std \ -drive file=" #$image ",if=virtio,cache=writeback,werror=report,readonly \ -m 256")) -- cgit v1.2.3