nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

machine: Rename 'system' field. 

* 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'.
master
Jakob L. Kreuze 2019-07-30 13:48:32 -04:00 committed by Christopher Lemmer Webber
parent 5bc751925d
commit d97ce20400
No known key found for this signature in database
GPG Key ID: 4BC025925FF8F4D3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -25510,7 +25510,7 @@ evaluates to. As an example, @var{file} might contain a definition like this:
%base-services)))) %base-services))))
(list (machine (list (machine
(system %system) (operating-system %system)
(environment managed-host-environment-type) (environment managed-host-environment-type)
(configuration (machine-ssh-configuration (configuration (machine-ssh-configuration
(host-name "localhost") (host-name "localhost")
@ -25551,7 +25551,7 @@ This is the data type representing a single machine in a heterogeneous Guix
deployment. deployment.
@table @asis @table @asis
@item @code{system} @item @code{operating-system}
The object of the operating system configuration to deploy. The object of the operating system configuration to deploy.
@item @code{environment} @item @code{environment}

12
gnu/machine.scm
View File

@ -34,7 +34,7 @@
machine? machine?
this-machine this-machine
machine-system machine-operating-system
machine-environment machine-environment
machine-configuration machine-configuration
machine-display-name machine-display-name
@ -85,14 +85,14 @@
make-machine make-machine
machine? machine?
this-machine this-machine
(system machine-system) ; <operating-system> (operating-system machine-operating-system) ; <operating-system>
(environment machine-environment) ; symbol (environment machine-environment) ; symbol
(configuration machine-configuration ; configuration object (configuration machine-configuration ; configuration object
(default #f))) ; specific to environment (default #f))) ; specific to environment
(define (machine-display-name machine) (define (machine-display-name machine)
"Return the host-name identifying 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) (define (machine-remote-eval machine exp)
"Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to

2
gnu/machine/ssh.scm
View File

@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent to oldest."
environment type of 'managed-host." environment type of 'managed-host."
(maybe-raise-unsupported-configuration-error machine) (maybe-raise-unsupported-configuration-error machine)
(mlet %store-monad ((boot-parameters (machine-boot-parameters 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 <>)) (eval (cut machine-remote-eval machine <>))
(menu-entries (map boot-parameters->menu-entry boot-parameters)) (menu-entries (map boot-parameters->menu-entry boot-parameters))
(bootloader-configuration (operating-system-bootloader os)) (bootloader-configuration (operating-system-bootloader os))