diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 22:02:38 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 22:02:38 +0200 |
| commit | 958a1fda9e0ad41468cbdb88766e7c854dd32df4 (patch) | |
| tree | 2e74aa2e9c58827dabed7d6b14ba58158cb99f6f /guix | |
| parent | 2f36d90f2d24738bda8dc522645ad8f50bd62207 (diff) | |
| download | guix-patches-958a1fda9e0ad41468cbdb88766e7c854dd32df4.tar guix-patches-958a1fda9e0ad41468cbdb88766e7c854dd32df4.tar.gz | |
system: Make grub use <menu-entry> instead of <boot-parameters> again.
* gnu/system/grub.scm: Remove boot-parameters->menu-entry.
(grub-configuration): Don't use boot-parameters->menu-entry.
* gnu/system.scm (operating-system-bootcfg): Use menu-entry.
* guix/scripts/system.scm (reinstall-grub): Use profile-grub-entries.
(perform-action): Use profile-grub-entries.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/system.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3ba420d8e7..9d86efdd77 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -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-boot-parameters %system-profile (list number))) + (entries (profile-grub-entries %system-profile (list number))) (old-generations (delv number (generation-numbers %system-profile))) - (old-entries (profile-boot-parameters %system-profile old-generations)) + (old-entries (profile-grub-entries %system-profile old-generations)) (grub.cfg (run-with-store store (grub-configuration-file grub-config entries @@ -643,7 +643,7 @@ output when building a system derivation, such as a disk image." (operating-system-bootcfg os (if (eq? 'init action) '() - (profile-boot-parameters))))) + (profile-grub-entries))))) ;; 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 |