05/05: guix system: Reinstalling the bootloader preserves extra menu entries.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit c3e59de9b1340f1a0ef7e30dd2e4e7bf7b484ee9
Author: Ludovic Courtès <address@hidden>
Date:   Wed Aug 28 23:31:28 2019 +0200

    guix system: Reinstalling the bootloader preserves extra menu entries.
    
    Fixes <https://bugs.gnu.org/36876>.
    Reported by Jesse Gibbons <address@hidden>.
    
    Previously 'guix system delete-generations' or 'switch-generation' would
    lose the extra bootloader menu entries specified in the current system's
    configuration.  This fixes that.
    
    * guix/scripts/system.scm (reinstall-bootloader): Turn PARAMS into a
    single <boot-parameters>.  Adjust ENTRIES to include extra menu entries
    specified in PARAMS.
---
 guix/scripts/system.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 9fc3a10..27b014d 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -384,12 +384,14 @@ STORE is an open connection to the store."
                              (bootloader bootloader)))
 
          ;; Make the specified system generation the default entry.
-         (params (profile-boot-parameters %system-profile (list number)))
+         (params (first (profile-boot-parameters %system-profile
+                                                 (list number))))
          (old-generations
           (delv number (reverse (generation-numbers %system-profile))))
          (old-params (profile-boot-parameters
                        %system-profile old-generations))
-         (entries (map boot-parameters->menu-entry params))
+         (entries (cons (boot-parameters->menu-entry params)
+                        (boot-parameters-bootloader-menu-entries params)))
          (old-entries (map boot-parameters->menu-entry old-params)))
     (run-with-store store
       (mlet* %store-monad