From mboxrd@z Thu Jan 1 00:00:00 1970 From: cmmarusich@gmail.com Subject: [PATCH 09/10] Rename grub-entries to profile-grub-entries Date: Fri, 28 Oct 2016 03:07:26 -0700 Message-ID: <20161028100727.1182-10-cmmarusich@gmail.com> References: <20161028100727.1182-1-cmmarusich@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c044o-0004TE-Fm for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c044n-00041r-Lh for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:54 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:33571) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c044n-000410-Dc for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:53 -0400 Received: by mail-pf0-x242.google.com with SMTP id i85so872357pfa.0 for ; Fri, 28 Oct 2016 03:07:53 -0700 (PDT) In-Reply-To: <20161028100727.1182-1-cmmarusich@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org From: Chris Marusich * 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