diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-08 22:26:05 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-08 23:47:28 +0200 |
| commit | 70608adb4a054438a9dee4abcf63858f3d0dfded (patch) | |
| tree | 018f460457693241cb76bda9463d80450539002b /gnu/system/vm.scm | |
| parent | c2619e10ea55ef12054eee41de58b1f6c867ac48 (diff) | |
| download | gnu-guix-70608adb4a054438a9dee4abcf63858f3d0dfded.tar gnu-guix-70608adb4a054438a9dee4abcf63858f3d0dfded.tar.gz | |
linux-initrd: Copy all the script's closure to the initrd.
* gnu/system/linux-initrd.scm (expression->initrd): Remove calls to
'imported-modules' and 'compiled-modules'. Use 'gexp->script' with
EXP. Add the result to TO-COPY. Make /init a symlink to that script,
and copy its closure into the "contents" directory. Add fake
/proc/self/exe symlink.
* gnu/build/linux-boot.scm (load-linux-module*): Add comment about mmap.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Add "-m
256". This turns out to be needed for initrds containing things like
e2fsck and several modules; with the default of 128 MiB, loading
libahci.ko may fail with -1.
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 205bf2cb19..4ee8dc5cf2 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -428,7 +428,9 @@ exec " #$qemu "/bin/" #$(qemu-command (%current-system)) "--system=" #$os-drv " --load=" #$os-drv "/boot --root=/dev/vda1\" \ -serial stdio \ -drive file=" #$image - ",if=virtio,cache=writeback,werror=report,readonly\n") + ",if=virtio,cache=writeback,werror=report,readonly \ + -m 256 +\n") port) (chmod port #o555)))) |