From mboxrd@z Thu Jan 1 00:00:00 1970 From: cmmarusich@gmail.com Subject: [PATCH 2/5] system: Rename previous-grub-entries to profile-grub-entries. Date: Tue, 1 Nov 2016 22:48:12 -0700 Message-ID: <20161102054815.11253-3-cmmarusich@gmail.com> References: <87d1ihscmr.fsf@gnu.org> <20161102054815.11253-1-cmmarusich@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1oPX-0007E0-U3 for guix-devel@gnu.org; Wed, 02 Nov 2016 01:48:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1oPX-0002Jy-8J for guix-devel@gnu.org; Wed, 02 Nov 2016 01:48:31 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:33893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c1oPX-0002JQ-21 for guix-devel@gnu.org; Wed, 02 Nov 2016 01:48:31 -0400 Received: by mail-pf0-x242.google.com with SMTP id y68so740774pfb.1 for ; Tue, 01 Nov 2016 22:48:30 -0700 (PDT) In-Reply-To: <20161102054815.11253-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, profile-grub-entries): Rename previous-grub-entries to profile-grub-entries to indicate that it is stateful and returns the entries for all profile generations, not just the previous ones. Update all callers. --- 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 e548be6..eee4422 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* (profile-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))))) + (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