[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: system: Build the initrd file name with 'file-append'.
From: |
Ludovic Courtès |
Subject: |
05/05: system: Build the initrd file name with 'file-append'. |
Date: |
Fri, 9 Sep 2016 22:01:08 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit ab20d74a4638dc6295aa9b9af276d2a98f238f9d
Author: Ludovic Courtès <address@hidden>
Date: Fri Sep 9 23:38:24 2016 +0200
system: Build the initrd file name with 'file-append'.
* gnu/system.scm (operating-system-initrd-file)
(operating-system-grub.cfg): Use 'file-append' to construct the initrd
file name.
---
gnu/system.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 18b2806..4c1de38 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -660,7 +660,7 @@ hardware-related operations as necessary when booting a
Linux container."
(mlet %store-monad ((initrd (make-initrd boot-file-systems
#:linux (operating-system-kernel os)
#:mapped-devices mapped-devices)))
- (return #~(string-append #$initrd "/initrd"))))
+ (return (file-append initrd "/initrd"))))
(define (locale-name->definition* name)
"Variant of 'locale-name->definition' that raises an error upon failure."
@@ -738,7 +738,7 @@ listed in OS. The C library expects to find it under
#~(string-append "--load=" #$system
"/boot")
(operating-system-kernel-arguments os)))
- (initrd #~(string-append #$system "/initrd"))))))
+ (initrd (file-append system "/initrd"))))))
(grub-configuration-file (operating-system-bootloader os)
store-fs entries
#:old-entries old-entries)))