From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:42687) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsELG-0005DV-8c for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsELF-00073B-8W for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40464) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsELF-000731-5x for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hsELC-0000KX-Ju for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:04 -0400 Subject: [bug#36847] [PATCH] machine: Rename 'system' field. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:42633) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsEKe-00059Y-0e for guix-patches@gnu.org; Mon, 29 Jul 2019 18:41:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsEKd-0006tF-1L for guix-patches@gnu.org; Mon, 29 Jul 2019 18:41:27 -0400 Received: from mx.sdf.org ([205.166.94.20]:51129) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsEKc-0006t7-Oa for guix-patches@gnu.org; Mon, 29 Jul 2019 18:41: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 x6TMfOw8005986 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Mon, 29 Jul 2019 22:41:25 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Date: Mon, 29 Jul 2019 18:38:35 -0400 Message-ID: <87h874ihzo.fsf@sdf.lonestar.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36847@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. * 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 ++++++------ 2 files changed, 8 insertions(+), 8 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 =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl0/dWsACgkQ9Qb9Fp2P 2VqnyhAApkapBUt5pUZ2sB5nxaZbb6pFxe00Do+upFmLYNZFRgSFpZxKXJALYadV jh0CT0jXxOqWxvH5+26LqJzmSSt0YohGab875zvzBHdupgOu/MPGOCYltrBvrzOk Pr/nxNAt+OckhFKKrCaKV85hONC0YiGPyBGuE0PVuib28SAXy8C73rwSlC47M4mZ sX1/Pl6X6K50sHXgFluWwzC8tU8S1dTMBHARjHsNPbCN5qYFORKsysn970WqOhM2 fQKiydhRtuA8chJAdN4ecaTHCV20g0Gjm5NdDT4mFj37WFuM/SfGs5Zu7KazNr2o qv8+yGohBvzpgzu50mzy/42UX1X+Ytz+ELFPsTwamU9JUdFO8CQV1+oeqtJ6OZrE rMP29y3jKQBC7O5SrPsP4sYY+jyYwo9+A8wb4rMZHtAFKKoLL61d0aRwV4edSinD +tbt6Za14q/IdIuhXiyY2HWsproDDaDHkgCjQ1sp7flBNqP/QI6UgZnCnAPXE2sp Yj4Vwio9Tc8hMI69Aauvdu8WiP/DyljTSAv/6FFIBX8YwTWPY3Z6hGKLUybQ9ckU nkhb/NTW50g0CKkXr75TuVyt/x3aUv1vEhPGVURly+1QmUSzGDQVyMdSmCj2Ie0E aoCHc6srNSD4kIjcqq9A7tcr5gTlME8clzIgKBMhk700fFr4tOY= =B51g -----END PGP SIGNATURE----- --=-=-=--