branch master updated: hydra: berlin: Copy the kernel, not the profile that contains it.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 5947c3e  hydra: berlin: Copy the kernel, not the profile that contains 
it.
5947c3e is described below

commit 5947c3e0d90b9f627c7ed442447b055bbf44e310
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue May 26 21:19:08 2020 +0200

    hydra: berlin: Copy the kernel, not the profile that contains it.
    
    Fixes a regression introduced with Guix commit
    5c79f238634c5adb6657f1b4b1bb4ddb8bb73ef1, which turned
    /run/current-system/kernel into a profile.
    
    * hydra/berlin.scm (%copy-kernel-and-initrd): Call 'canonicalize-path'
    to get at the real directory name of the kernel.
---
 hydra/berlin.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 9790c33..9e0ae15 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -89,8 +89,13 @@ Happy hacking!\n"))
                         (format #t "copying '~a' to /store...~%" file)
                         (copy-recursively file target
                                           #:log (%make-void-port "w")))))
-                  (list (readlink "/run/current-system/kernel")
-                        (dirname (readlink "/run/current-system/initrd")))))))
+
+                  ;; /run/current-system/kernel is a profile.  The trick
+                  ;; below allows us to get at its actual directory name,
+                  ;; which is what 'grub.cfg' refers to.
+                  (list (dirname
+                         (canonicalize-path 
"/run/current-system/kernel/bzImage"))
+                        (dirname (canonicalize-path 
"/run/current-system/initrd")))))))
 
 
 (operating-system