From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 30 13:51:32 2019 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 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) To: guix-patches@gnu.org Subject: [PATCH v2] machine: Rename 'system' field. 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 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 205.166.94.20 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * 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'. =2D-- 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 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -25507,7 +25507,7 @@ evaluates to. As an example, @var{file} might cont= ain a definition like this: %base-services)))) =20 (list (machine =2D (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. =20 @table @asis =2D@item @code{system} +@item @code{operating-system} The object of the operating system configuration to deploy. =20 @item @code{environment} diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a..30ae97f6ec 100644 =2D-- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -34,7 +34,7 @@ machine? this-machine =20 =2D machine-system + machine-operating-system machine-environment machine-configuration machine-display-name @@ -85,14 +85,14 @@ make-machine machine? this-machine =2D (system machine-system) ; =2D (environment machine-environment) ; symbol =2D (configuration machine-configuration ; configuration object =2D (default #f))) ; specific to environment + (operating-system machine-operating-system) ; + (environment machine-environment) ; symbol + (configuration machine-configuration ; configuration object + (default #f))) ; specific to environment =20 (define (machine-display-name machine) "Return the host-name identifying MACHINE." =2D (operating-system-host-name (machine-system machine))) + (operating-system-host-name (machine-operating-system machine))) =20 (define (machine-remote-eval machine exp) "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refe= rs to diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 552eafa9de..d1c90b6313 100644 =2D-- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent t= o oldest." environment type of 'managed-host." (maybe-raise-unsupported-configuration-error machine) (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) =2D (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)) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1AgvAACgkQ9Qb9Fp2P 2VrlmxAAqrAXp2RNpF9dtPzWrr70uXYTAZq4f66rxHpm44wt96TurSBaywXtv2aJ Ru9ZP7glGoi+qlv9vb1u3CWCRWaeXFORnKoynGjiZ2LHU8Q+hhcotxbN9Ob6MsmG JKln2s+SlHohzlxQUhwa5CS5nvoGExq9e0lXAtNr5JoXZ75BKHhCY3hFhozulJdl XoriA7pndU77OVRE5Duund46uv6KljqjoKE9qhGnC1W14eDrN2j2fGnm+G034zI5 +rinLgqN8AnLG9n0Qn7bQkg7z6TPlkWNN0sKcTOJ9thmVioURbnUbU1bByXgPk9c 1LqRQljwviJoSlWv5kavzyOPrR5R6m3LsqGiK9xQmPTpoD6mGHm5+8UP8I2dJc30 GeTZAHUUG/L4nrjovAXjfumhOf06GC4Iez+brlVcmciGPbGt333Sy2lXrVyfLD7I dipEJQ+6VmlM6Flr1NadtYvNie8QMR7HpXLO0JpdApxW+uolB2OQBQ+z6ku9uB0w Gu1ibLhUaYcC6+6ad4Vu+ksrM7KgWVolj2kswaxzMvq82KtV9x8lpsysI9nsxxVa DcMwNzctN5ydZTeh++mpTZD9NLPkG0HtR/nSOPewOxNbyxQY0Vo8XwjvBeCBM8+K vBsAoDgqhl6mQkh92keiHhr2HW2FE5RpeNBJ34QqZA7dE2a5DTA= =W12Y -----END PGP SIGNATURE----- --=-=-=--