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.scm | |
parent | 437c78bcfb268fe9d4e6116b2eb083ed873215f4 (diff) | |
parent | d422cbb3d6a1cc7e4553a2335b113475a05d68ad (diff) | |
download | guix-ec8130eb23b79c2b8b61043f25dafcefd0daafe7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 1766c8f90f..a5a8f40d66 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -870,12 +870,11 @@ hardware-related operations as necessary when booting a Linux container." (define make-initrd (operating-system-initrd os)) - (let ((initrd (make-initrd boot-file-systems - #:linux (operating-system-kernel os) - #:linux-modules - (operating-system-initrd-modules os) - #:mapped-devices mapped-devices))) - (file-append initrd "/initrd"))) + (make-initrd boot-file-systems + #:linux (operating-system-kernel os) + #:linux-modules + (operating-system-initrd-modules os) + #:mapped-devices mapped-devices)) (define (locale-name->definition* name) "Variant of 'locale-name->definition' that raises an error upon failure." |