From patchwork Sat Feb 25 18:57:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47321 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3D47B16AFC; Sat, 25 Feb 2023 19:01:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C26AB16B96 for ; Sat, 25 Feb 2023 19:00:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzlE-0001rZ-C9; Sat, 25 Feb 2023 13:59:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVzlA-0001op-Gf for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzlA-0000br-8K for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzlA-0007wU-1m for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 03/27] services: base: Deprecate 'mingetty-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61789@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61789-submit@debbugs.gnu.org id=B61789.167735151130320 (code B ref 61789); Sat, 25 Feb 2023 18:59:04 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:58:31 +0000 Received: from localhost ([127.0.0.1]:41438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkd-0007ss-9N for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:31 -0500 Received: from smtpm8.myservices.hosting ([185.26.105.209]:45978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkV-0007rN-Ua for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:24 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm8.myservices.hosting (Postfix) with ESMTP id 658BB20D4F for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 12D268009A; Sat, 25 Feb 2023 19:58:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id uCCHdpSfcLM8; Sat, 25 Feb 2023 19:58:17 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 9A29D80079; Sat, 25 Feb 2023 19:58:17 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:57:49 +0000 Message-Id: <1d46c585596ea41630eb7e388035ad45079e3ad3.1677350249.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi (Base Services): Replace mingetty-service with mingetty-service-type. * gnu/services/base.scm (mingetty-service): Deprecate procedure. --- doc/guix.texi | 15 +++++++-------- gnu/services/base.scm | 5 +++-- gnu/system/install.scm | 7 ++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index cb0d18ebdc..2225b25a47 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18123,18 +18123,17 @@ Base Services @end table @end deftp -@deffn {Scheme Procedure} mingetty-service @var{config} -Return a service to run mingetty according to @var{config}, a -@code{} object, which specifies the tty to run, among -other things. -@end deffn +@defvar mingetty-service-type +Type of the service that runs Mingetty, an implementation of the +virtual console log-in. The value for this service is a +@code{} object. +@end defvar @deftp {Data Type} mingetty-configuration -This is the data type representing the configuration of Mingetty, which -provides the default implementation of virtual console log-in. +Data type representing the configuration of Mingetty, which specifies +the tty to run, among other things. @table @asis - @item @code{tty} The name of the console this Mingetty runs on---e.g., @code{"tty1"}. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 8dfd92aacf..c762485054 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -173,7 +173,7 @@ (define-module (gnu services base) mingetty-configuration-clear-on-logout? mingetty-configuration-mingetty mingetty-configuration? - mingetty-service + mingetty-service ; deprecated mingetty-service-type %nscd-default-caches @@ -1275,7 +1275,8 @@ (define mingetty-service-type "Provide console login using the @command{mingetty} program."))) -(define* (mingetty-service config) +(define-deprecated (mingetty-service config) + mingetty-service-type "Return a service to run mingetty according to @var{config}, which specifies the tty to run, among other things." (service mingetty-service-type config)) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 8c7585f188..1b05a862c6 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -331,9 +331,10 @@ (define* (%installation-services #:key (system (or (and=> Access documentation at any time by pressing Alt-F2.\x1b[0m "))) (define (normal-tty tty) - (mingetty-service (mingetty-configuration (tty tty) - (auto-login "root") - (login-pause? #t)))) + (service mingetty-service-type + (mingetty-configuration (tty tty) + (auto-login "root") + (login-pause? #t)))) (define bare-bones-os (load "examples/bare-bones.tmpl"))