From patchwork Fri Oct 28 10:07:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Marusich X-Patchwork-Id: 16893 Received: (qmail 124037 invoked by uid 89); 28 Oct 2016 10:09:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Oct 2016 10:09:32 +0000 Received: from localhost ([::1]:47953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c046M-0005YF-Mi for patchwork@sourceware.org; Fri, 28 Oct 2016 06:09:30 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8On0wAzm+5NxQVhLw/pi2n4RfV8SPPZsrbZUhFA7Dls=; b=eizrwu/jsSWJrQ9ZK/CzzgO+aDp7h6o5SfoaM2oCjSwwT2mJuSJPfDDYbr4Bd5vwoi 89n/XOcY9Xog1QHWBI6hZGps+5nVhTnNvUu6vbIT2s1jMH+58dyBhW8UuXaNtNdiz/vn PoVSEhljmWUGp4guWGIKE4sh/yplPsPMGM7g9V6UrjCwc64ABEKymJnz1ULlYm++KlGU A5wGJCm0gFB4mYyeuaQ15+12OyT7rkOBZSevZcjNt0iKDtCEHoJHe/JW9KlZB0raxHY3 gpbCzGbYCBg1OI+MYMCX6d/AKvsFHHu8YpAFTAvZX3cyvgbeafz0HeRAluWl36mK38Ro kQ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8On0wAzm+5NxQVhLw/pi2n4RfV8SPPZsrbZUhFA7Dls=; b=J8wnamQaSGGCv0CBpONP8RXHvGGk/+IqTj6HDMJI4RW2Kx7hV+0fZOJvExQYEvU5jT O82nqqJ/rM9/tHcXRYfmC5cZn3Ulgr8yu7mKYUb0OvTNkkiPpeMHjkIxYwcWZeJu0LPC 5E0qlsnZE7D0subb+6kE9DmEqD7XjwJAWqBLZm/VpbwJHrNVW00tPAJUarfykdOZglAg Z4KyCYzxHBqROY1c5ACMcIwjib9yxJjgWrrfW+ynbzN0Dtw0ufKsPjvu+yG/21HDHvnZ yfejAN2gqKeM8s4ZPzofldQWDpvj4G5pfNeiqLeBvrrWOxRHFTzx3/eaSjNozosCFLDZ tFtA== X-Gm-Message-State: ABUngve6hDNq5Jk+/NG2+8Bt5uk3MhgGmdaK9/oTlEREAzFBuAdLw5Uk0Koa0x/5oM+hlg== X-Received: by 10.98.159.130 with SMTP id v2mr23703366pfk.48.1477649272073; Fri, 28 Oct 2016 03:07:52 -0700 (PDT) Received: from garuda.hsd1.wa.comcast.net. ([2601:602:9d80:188d:4e0f:6eff:fef6:70b9]) by smtp.gmail.com with ESMTPSA id t7sm17798508pfa.22.2016.10.28.03.07.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2016 03:07:51 -0700 (PDT) From: cmmarusich@gmail.com To: guix-devel@gnu.org 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> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161028100727.1182-1-cmmarusich@gmail.com> References: <20161028100727.1182-1-cmmarusich@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" 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