[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36847] [PATCH] machine: Rename 'system' field.
From: |
Jakob L. Kreuze |
Subject: |
[bug#36847] [PATCH] machine: Rename 'system' field. |
Date: |
Mon, 29 Jul 2019 18:38:35 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) |
* 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'.
---
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
--- 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) ; <operating-system>
- (environment machine-environment) ; symbol
- (configuration machine-configuration ; configuration object
- (default #f))) ; specific to environment
+ (operating-system machine-operating-system) ; <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
--
2.22.0
signature.asc
Description: PGP signature
- [bug#36847] [PATCH] machine: Rename 'system' field.,
Jakob L. Kreuze <=