~ruther/guix-local

ab20d74a4638dc6295aa9b9af276d2a98f238f9d — Ludovic Courtès 9 years ago 44d5f54
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.
1 files changed, 2 insertions(+), 2 deletions(-)

M gnu/system.scm
M gnu/system.scm => gnu/system.scm +2 -2
@@ 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)))