From patchwork Tue Jul 30 17:48:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakob L. Kreuze" X-Patchwork-Id: 14797 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A472017292; Tue, 30 Jul 2019 18:52:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 63C1317290 for ; Tue, 30 Jul 2019 18:52:13 +0100 (BST) Received: from localhost ([::1]:35398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsWIH-0006Z2-3F for patchwork@mira.cbaines.net; Tue, 30 Jul 2019 13:52:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38938) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsWI8-0006Xs-Kg for guix-patches@gnu.org; Tue, 30 Jul 2019 13:52:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsWI7-0008Io-Is for guix-patches@gnu.org; Tue, 30 Jul 2019 13:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsWI7-0008IX-GI for guix-patches@gnu.org; Tue, 30 Jul 2019 13:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hsWI6-0006Lp-H5 for guix-patches@gnu.org; Tue, 30 Jul 2019 13:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36847] [PATCH v2] machine: Rename 'system' field. Resent-From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jul 2019 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36847@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156450909224371 (code B ref -1); Tue, 30 Jul 2019 17:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jul 2019 17:51:32 +0000 Received: from localhost ([127.0.0.1]:51130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsWHc-0006L1-Dy for submit@debbugs.gnu.org; Tue, 30 Jul 2019 13:51:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:48721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsWHZ-0006Ks-7z for submit@debbugs.gnu.org; Tue, 30 Jul 2019 13:51:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38788) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsWHY-0006PB-26 for guix-patches@gnu.org; Tue, 30 Jul 2019 13:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsWHW-0007rc-Le for guix-patches@gnu.org; Tue, 30 Jul 2019 13:51:28 -0400 Received: from ol.sdf.org ([205.166.94.20]:55778 helo=mx.sdf.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsWHW-0007qf-Dk for guix-patches@gnu.org; Tue, 30 Jul 2019 13:51:26 -0400 Received: from Epsilon (pool-173-76-53-40.bstnma.fios.verizon.net [173.76.53.40]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x6UHpNAp016275 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Tue, 30 Jul 2019 17:51:24 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87h874ihzo.fsf@sdf.lonestar.org> Date: Tue, 30 Jul 2019 13:48:32 -0400 In-Reply-To: <87h874ihzo.fsf@sdf.lonestar.org> (Jakob L. Kreuze's message of "Mon, 29 Jul 2019 18:38:35 -0400") Message-ID: <87r267v2fj.fsf@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. All callers changed. * doc/guix.texi (Invoking guix deploy): Use the 'machine-operating-system' accessor rather than 'machine-system'. --- doc/guix.texi | 4 ++-- gnu/machine.scm | 12 ++++++------ gnu/machine/ssh.scm | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ccc36a8a97..cb3778af51 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25507,7 +25507,7 @@ evaluates to. As an example, @var{file} might contain a definition like this: %base-services)))) (list (machine - (system %system) + (operating-system %system) (environment managed-host-environment-type) (configuration (machine-ssh-configuration (host-name "localhost") @@ -25532,7 +25532,7 @@ This is the data type representing a single machine in a heterogeneous Guix deployment. @table @asis -@item @code{system} +@item @code{operating-system} The object of the operating system configuration to deploy. @item @code{environment} diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a..30ae97f6ec 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -34,7 +34,7 @@ machine? this-machine - machine-system + machine-operating-system machine-environment machine-configuration machine-display-name @@ -85,14 +85,14 @@ make-machine machine? this-machine - (system machine-system) ; - (environment machine-environment) ; symbol - (configuration machine-configuration ; configuration object - (default #f))) ; specific to environment + (operating-system machine-operating-system) ; + (environment machine-environment) ; symbol + (configuration machine-configuration ; configuration object + (default #f))) ; specific to environment (define (machine-display-name machine) "Return the host-name identifying MACHINE." - (operating-system-host-name (machine-system machine))) + (operating-system-host-name (machine-operating-system machine))) (define (machine-remote-eval machine exp) "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 552eafa9de..d1c90b6313 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent to oldest." environment type of 'managed-host." (maybe-raise-unsupported-configuration-error machine) (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) - (let* ((os (machine-system machine)) + (let* ((os (machine-operating-system machine)) (eval (cut machine-remote-eval machine <>)) (menu-entries (map boot-parameters->menu-entry boot-parameters)) (bootloader-configuration (operating-system-bootloader os))