diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-22 00:10:44 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-22 00:10:44 +0100 |
| commit | ec8130eb23b79c2b8b61043f25dafcefd0daafe7 (patch) | |
| tree | 4a2f05d13900ee0ea61753d85d0727630b4e22e8 /gnu/system | |
| parent | 437c78bcfb268fe9d4e6116b2eb083ed873215f4 (diff) | |
| parent | d422cbb3d6a1cc7e4553a2335b113475a05d68ad (diff) | |
| download | guix-ec8130eb23b79c2b8b61043f25dafcefd0daafe7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 9 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index a53d3cb106..983c6d81c8 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -91,16 +91,17 @@ the derivations referenced by EXP are automatically copied to the initrd." (lambda (port) (simple-format port "~A\n" #$guile))) - (build-initrd (string-append #$output "/initrd") + (build-initrd (string-append #$output "/initrd.cpio.gz") #:guile #$guile #:init #$init ;; Copy everything INIT refers to into the initrd. #:references-graphs '("closure") #:gzip (string-append #$gzip "/bin/gzip"))))) - (computed-file name builder - #:options - `(#:references-graphs (("closure" ,init))))) + (file-append (computed-file name builder + #:options + `(#:references-graphs (("closure" ,init)))) + "/initrd.cpio.gz")) (define (flat-linux-module-directory linux modules) "Return a flat directory containing the Linux kernel modules listed in diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 8e310a1607..9400e6310d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -213,7 +213,7 @@ made available under the /xchg CIFS share." (let* ((inputs '#$(list qemu (canonical-package coreutils))) (linux (string-append #$linux "/" #$(system-linux-image-file-name))) - (initrd (string-append #$initrd "/initrd")) + (initrd #$initrd) (loader #$loader) (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) |