From mboxrd@z Thu Jan 1 00:00:00 1970 From: cmmarusich@gmail.com Subject: [PATCH 05/10] Rename previous-grub-entries to grub-entries Date: Fri, 28 Oct 2016 03:07:22 -0700 Message-ID: <20161028100727.1182-6-cmmarusich@gmail.com> References: <20161028100727.1182-1-cmmarusich@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c044l-0004Rq-Uz for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c044k-0003zP-P9 for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:51 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c044k-0003yn-Hh for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:50 -0400 Received: by mail-pf0-x244.google.com with SMTP id n85so880359pfi.3 for ; Fri, 28 Oct 2016 03:07:50 -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 (previous-grub-entries): rename this procedure to grub-entries. Update all callers. This procedure actually returns an entry for every generation of the profile, so its name is confusing if it suggests that it only returns "previous" entries. --- guix/scripts/system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 4edaa0f..a4f5c7b 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* (previous-grub-entries #:optional (profile %system-profile)) +(define* (grub-entries #:optional (profile %system-profile)) "Return a list of 'menu-entry' for the generations of PROFILE." (define (system->grub-entry system number time) (unless-file-not-found @@ -563,7 +563,7 @@ building anything." (operating-system-grub.cfg os (if (eq? 'init action) '() - (previous-grub-entries))))) + (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