diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2019-12-12 04:10:59 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2019-12-12 04:10:59 +0200 |
commit | c9e676d0b141f510c19e26edb1e6fad079b9b502 (patch) | |
tree | 79abb4a4b92ecf4504a46e55ffa7971a06c8a5df /gnu/machine.scm | |
parent | d45720d8b456e82380601d77e25bd05c6e0dc36a (diff) | |
parent | dcb7ce500bd025455982d74c3384c707f35bbb46 (diff) | |
download | guix-c9e676d0b141f510c19e26edb1e6fad079b9b502.tar guix-c9e676d0b141f510c19e26edb1e6fad079b9b502.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/machine.scm')
-rw-r--r-- | gnu/machine.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/machine.scm b/gnu/machine.scm index 05b03b21d4..bdd92d9592 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -33,7 +33,6 @@ machine machine? - this-machine machine-operating-system machine-environment @@ -89,15 +88,18 @@ ;;; Declarations for machines in a deployment. ;;; -(define-record-type* <machine> machine - make-machine +(define-record-type* <machine> machine make-machine machine? - this-machine - (operating-system machine-operating-system) ; <operating-system> + (operating-system %machine-operating-system); <operating-system> (environment machine-environment) ; symbol (configuration machine-configuration ; configuration object (default #f))) ; specific to environment +(define (machine-operating-system machine) + "Return the operating system of MACHINE." + (operating-system-with-provenance + (%machine-operating-system machine))) + (define (machine-display-name machine) "Return the host-name identifying MACHINE." (operating-system-host-name (machine-operating-system machine))) |