From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:42796) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibBIW-0006Ps-Cr for guix-patches@gnu.org; Sat, 30 Nov 2019 17:33:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibBIV-0004Rp-8H for guix-patches@gnu.org; Sat, 30 Nov 2019 17:33:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibBIV-0004Rl-5A for guix-patches@gnu.org; Sat, 30 Nov 2019 17:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibBIV-0006lN-3M for guix-patches@gnu.org; Sat, 30 Nov 2019 17:33:03 -0500 Subject: [bug#38441] [PATCH 3/5] machine: Add provenance tracking to each machine operating system. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 30 Nov 2019 23:31:46 +0100 Message-Id: <20191130223148.14336-3-ludo@gnu.org> In-Reply-To: <20191130223148.14336-1-ludo@gnu.org> References: <20191130223148.14336-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 38441@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= * gnu/machine.scm (): Rename accessor to '%machine-operating-system'. (machine-operating-system): New procedure. * doc/guix.texi (Service Reference): Mention it. --- doc/guix.texi | 4 ++-- gnu/machine.scm | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3dc2fd1318..198792c54a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -27056,8 +27056,8 @@ comparison less trivial. @end quotation This service is automatically added to your operating system -configuration when you use @command{guix system reconfigure} or -@command{guix system init}. +configuration when you use @command{guix system reconfigure}, +@command{guix system init}, or @command{guix deploy}. @end defvr @node Shepherd Services diff --git a/gnu/machine.scm b/gnu/machine.scm index 05b03b21d4..b342fe2144 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -93,11 +93,16 @@ make-machine machine? this-machine - (operating-system machine-operating-system) ; + (operating-system %machine-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))) -- 2.24.0