From patchwork Sat Feb 25 18:57:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47323 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 996E516AFC; Sat, 25 Feb 2023 19:01:04 +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=unavailable 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 DFA9716BBA 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-0001rR-7R; 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 1pVzl8-0001o4-CE for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:03 -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 1pVzl8-0000bH-3l for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzl8-0007vp-0o for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 02/27] services: base: Deprecate 'login-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:01 +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.167735150230204 (code B ref 61789); Sat, 25 Feb 2023 18:59:01 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:58:22 +0000 Received: from localhost ([127.0.0.1]:41416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkT-0007r1-P9 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:22 -0500 Received: from smtpm8.myservices.hosting ([185.26.105.209]:45952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkQ-0007qZ-Pd for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:20 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm8.myservices.hosting (Postfix) with ESMTP id 12E6C20D4A for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id AE89C8009B; Sat, 25 Feb 2023 19:58:17 +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 Vynbh14QySMq; 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 4509380098; Sat, 25 Feb 2023 19:58:17 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:57:48 +0000 Message-Id: <3f2d8fea6e785811c1a139f4fb0efc17a6b4be44.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 with login-service-type. * gnu/services/base.scm (login-service): Deprecate procedure. * gnu/system/install.scm (%installation-services): Use login-service-type. --- doc/guix.texi | 12 ++++++------ gnu/services/base.scm | 5 +++-- gnu/system/install.scm | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9d5dd495c0..cb0d18ebdc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18101,14 +18101,14 @@ Base Services host names. @end defun -@deffn {Scheme Procedure} login-service @var{config} -Return a service to run login according to @var{config}, a -@code{} object, which specifies the message of the day, -among other things. -@end deffn +@defvar login-service-type +Type of the service that provides a console login service, whose value +is a @code{} object. +@end defvar @deftp {Data Type} login-configuration -This is the data type representing the configuration of login. +Data type representing the configuration of login, which specifies the +@acronym{MOTD, message of the day}, among other things. @table @asis diff --git a/gnu/services/base.scm b/gnu/services/base.scm index c471107883..8dfd92aacf 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -158,7 +158,7 @@ (define-module (gnu services base) login-configuration login-configuration? login-service-type - login-service + login-service ; deprecated agetty-configuration agetty-configuration? @@ -937,7 +937,8 @@ (define login-service-type "Provide a console log-in service as specified by its configuration value, a @code{login-configuration} object."))) -(define* (login-service #:optional (config (login-configuration))) +(define-deprecated (login-service #:optional (config (login-configuration))) + login-service-type "Return a service configure login according to @var{config}, which specifies the message of the day, among other things." (service login-service-type config)) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index b3cf7a1bd8..8c7585f188 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -347,8 +347,9 @@ (define* (%installation-services #:key (system (or (and=> (virtual-terminal "tty1") (login-program (installer-program)))) - (login-service (login-configuration - (motd motd))) + (service login-service-type + (login-configuration + (motd motd))) ;; Documentation. The manual is in UTF-8, but ;; 'console-font-service' sets up Unicode support and loads a font