nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix system: Reinstalling the bootloader preserves extra menu entries. 

Fixes <https://bugs.gnu.org/36876>.
Reported by Jesse Gibbons <jgibbons2357@gmail.com>.

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.
This commit is contained in:
Ludovic Courtès 2019-08-28 23:31:28 +02:00
parent a28cfee841
commit c3e59de9b1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/scripts/system.scm
View File

@ -384,12 +384,14 @@ STORE is an open connection to the store."
(bootloader bootloader))) (bootloader bootloader)))
;; Make the specified system generation the default entry. ;; 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 (old-generations
(delv number (reverse (generation-numbers %system-profile)))) (delv number (reverse (generation-numbers %system-profile))))
(old-params (profile-boot-parameters (old-params (profile-boot-parameters
%system-profile old-generations)) %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))) (old-entries (map boot-parameters->menu-entry old-params)))
(run-with-store store (run-with-store store
(mlet* %store-monad (mlet* %store-monad