diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-21 14:37:13 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-05-05 15:03:48 +0200 |
| commit | bf8b09169c7d8ae48ac99ea237b82867ee9aa885 (patch) | |
| tree | a9230a5a577cbb5a1983ff8065fd63345eeb266a /guix | |
| parent | 370ae085b5107a0928fd744a987fb4070bdf6a00 (diff) | |
| download | gnu-guix-bf8b09169c7d8ae48ac99ea237b82867ee9aa885.tar gnu-guix-bf8b09169c7d8ae48ac99ea237b82867ee9aa885.tar.gz | |
system: grub: Use boot-parameters instead of menu-entry where possible.
* gnu/system/grub.scm (boot-parameters->menu-entry): New variable.
(grub-configuration-file): Use boot-parameters
instead of menu-entry where possible.
* guix/scripts/system.scm (profile-boot-parameters): Update docstring.
(reinstall-grub): Use profile-boot-parameters.
(perform-action): Use profile-boot-parameters.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/system.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 88368f8f9e..5845992b4d 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -365,7 +365,7 @@ it atomically, and then run OS's activation script." (define* (profile-boot-parameters #:optional (profile %system-profile) (numbers (generation-numbers profile))) - "Return a list of 'menu-entry' for the generations of PROFILE specified by + "Return a list of 'boot-parameters' for the generations of PROFILE specified by NUMBERS, which is a list of generation numbers." (define (system->boot-parameters system number time) (unless-file-not-found @@ -456,9 +456,9 @@ open connection to the store." ;; from the actual past values for this generation's entry. (grub-config (grub-configuration (device root-device))) ;; Make the specified system generation the default entry. - (entries (profile-grub-entries %system-profile (list number))) + (entries (profile-boot-parameters %system-profile (list number))) (old-generations (delv number (generation-numbers %system-profile))) - (old-entries (profile-grub-entries %system-profile old-generations)) + (old-entries (profile-boot-parameters %system-profile old-generations)) (grub.cfg (run-with-store store (grub-configuration-file grub-config entries @@ -642,7 +642,7 @@ output when building a system derivation, such as a disk image." (operating-system-bootcfg os (if (eq? 'init action) '() - (profile-grub-entries))))) + (profile-boot-parameters))))) ;; For 'init' and 'reconfigure', always build GRUB.CFG, even if ;; --no-grub is passed, because GRUB.CFG because we then use it as a GC |