From: Chris Marusich <cmmarus...@gmail.com> * guix/scripts/system.scm (grub-entries): Rename this procedure to 'profile-grub-entries'. Update all callers. --- guix/scripts/system.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 086b431..2ee145a 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -366,7 +366,7 @@ it atomically, and then run OS's activation script." (date->string (time-utc->date time) "~Y-~m-~d ~H:~M"))) -(define* (grub-entries #:optional (profile %system-profile) +(define* (profile-grub-entries #:optional (profile %system-profile) (numbers (generation-numbers profile))) "Return a list of 'menu-entry' for the generations of PROFILE specified by NUMBERS, which is a list of generation numbers." @@ -441,9 +441,9 @@ generation as its default entry." ;; 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 (grub-entries %system-profile (list number))) + (entries (profile-grub-entries %system-profile (list number))) (old-generations (delv number (generation-numbers %system-profile))) - (old-entries (grub-entries %system-profile old-generations)) + (old-entries (profile-grub-entries %system-profile old-generations)) (grub.cfg (run-with-store store (grub-configuration-file grub-config store-mount-point @@ -625,7 +625,7 @@ building anything." (operating-system-grub.cfg os (if (eq? 'init action) '() - (grub-entries))))) + (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 -- 2.9.2