diff options
| author | Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> | 2019-07-30 13:48:32 -0400 |
|---|---|---|
| committer | Christopher Lemmer Webber <cwebber@dustycloud.org> | 2019-08-06 15:48:51 -0400 |
| commit | d97ce20400b5d2967bfbc0e9fbfb99bbb2daed4f (patch) | |
| tree | f01951db68223d09a813c26c8294029d98d034c5 /gnu | |
| parent | 5bc751925d19c8b84ef12873bebba78ee61e605e (diff) | |
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'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/machine.scm | 12 | ||||
| -rw-r--r-- | gnu/machine/ssh.scm | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a8..30ae97f6ecb 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | machine? | 34 | machine? |
| 35 | this-machine | 35 | this-machine |
| 36 | 36 | ||
| 37 | machine-system | 37 | machine-operating-system |
| 38 | machine-environment | 38 | machine-environment |
| 39 | machine-configuration | 39 | machine-configuration |
| 40 | machine-display-name | 40 | machine-display-name |
| @@ -85,14 +85,14 @@ | |||
| 85 | make-machine | 85 | make-machine |
| 86 | machine? | 86 | machine? |
| 87 | this-machine | 87 | this-machine |
| 88 | (system machine-system) ; <operating-system> | 88 | (operating-system machine-operating-system) ; <operating-system> |
| 89 | (environment machine-environment) ; symbol | 89 | (environment machine-environment) ; symbol |
| 90 | (configuration machine-configuration ; configuration object | 90 | (configuration machine-configuration ; configuration object |
| 91 | (default #f))) ; specific to environment | 91 | (default #f))) ; specific to environment |
| 92 | 92 | ||
| 93 | (define (machine-display-name machine) | 93 | (define (machine-display-name machine) |
| 94 | "Return the host-name identifying MACHINE." | 94 | "Return the host-name identifying MACHINE." |
| 95 | (operating-system-host-name (machine-system machine))) | 95 | (operating-system-host-name (machine-operating-system machine))) |
| 96 | 96 | ||
| 97 | (define (machine-remote-eval machine exp) | 97 | (define (machine-remote-eval machine exp) |
| 98 | "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to | 98 | "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 552eafa9de0..d1c90b63134 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." | |||
| 166 | environment type of 'managed-host." | 166 | environment type of 'managed-host." |
| 167 | (maybe-raise-unsupported-configuration-error machine) | 167 | (maybe-raise-unsupported-configuration-error machine) |
| 168 | (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) | 168 | (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) |
| 169 | (let* ((os (machine-system machine)) | 169 | (let* ((os (machine-operating-system machine)) |
| 170 | (eval (cut machine-remote-eval machine <>)) | 170 | (eval (cut machine-remote-eval machine <>)) |
| 171 | (menu-entries (map boot-parameters->menu-entry boot-parameters)) | 171 | (menu-entries (map boot-parameters->menu-entry boot-parameters)) |
| 172 | (bootloader-configuration (operating-system-bootloader os)) | 172 | (bootloader-configuration (operating-system-bootloader os)) |
