From patchwork Mon Dec 27 22:24:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35717 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 914F927BBEA; Mon, 27 Dec 2021 22:25:14 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 13E1927BBE9 for ; Mon, 27 Dec 2021 22:25:14 +0000 (GMT) Received: from localhost ([::1]:43570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1yQa-0002rb-Vs for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 17:25:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1yQQ-0002qp-Tq for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1yQQ-0002Ao-Kz for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1yQQ-0007IZ-Fs for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47979] [PATCH v7 1/3] installer: Offer the CUPS printing service on a dedicated page. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 22:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47979@debbugs.gnu.org Received: via spool by 47979-submit@debbugs.gnu.org id=B47979.164064386627983 (code B ref 47979); Mon, 27 Dec 2021 22:25:02 +0000 Received: (at 47979) by debbugs.gnu.org; 27 Dec 2021 22:24:26 +0000 Received: from localhost ([127.0.0.1]:44493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1yPp-0007HE-PU for submit@debbugs.gnu.org; Mon, 27 Dec 2021 17:24:26 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:35241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1yPm-0007Go-Rq for 47979@debbugs.gnu.org; Mon, 27 Dec 2021 17:24:24 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 9B8433200F76; Mon, 27 Dec 2021 17:24:16 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 27 Dec 2021 17:24:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=V0WbCjdUKX2p+GUYhuVRuYT 7tbkIif30whujIQ0ciSI=; b=KB4AsaVWibaO0hWcJnS3IEHfKq1GX/U1vYwek39 zdwR0nc8JSeNW1e244WkzJVbYM/yzMiRAicpSTtgqzWFjFlZqvq3cWhtscFP116D yTF4MX1Rjt9lag3chusVriosrKSsuCHzgBbwcQ0K2ecv+/aajlfgMYVNqLtKaPVb uhRc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=V0WbCjdUKX2p+GUYh uVRuYT7tbkIif30whujIQ0ciSI=; b=G33dBZTtPv0mK0x2ztMSFrcxXqrlqmz/t dYiO+EfBJmqwKIzlA7TTiaOVkZPTxgVUQHtTlVyIT85iUQ+64/lvI3hPpElOsrbL R26OGCbBDjSfYvZTS64hIPEWcpzxVhBSmyYY6AqTdlmsEtr2h9NbQx585XIIPctz EB90Q54hOgdnlYFGHUcYdVQeg79KdJH8pMiXNj93NufUz4JXRH9AD/I4PfQCrjgi BjvZEv/zXu8hDvKMaxA2dTJPFztyVDm8yI2mHZ/tnhggMU8DnDPzZopKT6i9sevV dLKYJpSUwep9C52AMD14m60dVdyUBWkQrESWauAPe7EbE/W2KVxJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddujedgudegvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuud dvgeeiffevkeeuffefteduvdfhhfduhfenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <47979@debbugs.gnu.org>; Mon, 27 Dec 2021 17:24:15 -0500 (EST) From: Leo Famulari Date: Mon, 27 Dec 2021 17:24:08 -0500 Message-Id: <422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 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" X-getmail-retrieved-from-mailbox: Patches Currently, this page of the installer offers to the user all installer services that are not of the types 'desktop', 'network-management', or 'networking'. Concretely, this means that it offers the CUPS printing service, because that is the only service of a different type defined in the installer. In later commits, we will add some services of a new type, and we only want them to be offered when the user is installing a non-graphical system. At least one of these new services (NTP) is part of %desktop-services. If it were offered on run-other-services-cbt-page, and the user had configured a system using %desktop-services, the user could accidentally add NTP to their services twice, which is an error and would break installation. So, this commit makes the run-other-services-cbt-page be more specific about what services to offer. This allows us to later create a new checkbox page that only runs when %desktop-services is not selected. * gnu/installer/newt/services.scm (run-other-services-cbt-page): Rename to ... (run-printing-services-cbt-page): ... new variable, and select only 'document' services. (run-services-page): Adjust accordingly. * gnu/installer/tests.scm (choose-services): Adjust accordingly. --- gnu/installer/newt/services.scm | 16 +++++++--------- gnu/installer/tests.scm | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm index 1af4e7df2d..b4b5219b20 100644 --- a/gnu/installer/newt/services.scm +++ b/gnu/installer/newt/services.scm @@ -68,18 +68,16 @@ (define (run-networking-cbt-page) (condition (&installer-step-abort))))))) -(define (run-other-services-cbt-page) - "Run a page allowing the user to select other services." +(define (run-printing-services-cbt-page) + "Run a page allowing the user to select document services such as CUPS." (let ((items (filter (lambda (service) - (not (member (system-service-type service) - '(desktop - network-management - networking)))) + (eq? 'document + (system-service-type service))) %system-services))) (run-checkbox-tree-page - #:info-text (G_ "You can now select other services to run on your \ + #:info-text (G_ "You can now select the CUPS printing service to run on your \ system.") - #:title (G_ "Other services") + #:title (G_ "Printing and document services") #:items items #:selection (map system-service-recommended? items) #:item->text (compose G_ system-service-name) @@ -123,4 +121,4 @@ (define (run-services-page) (if (null? desktop) (list (run-network-management-page)) '()) - (run-other-services-cbt-page)))) + (run-printing-services-cbt-page)))) diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm index 12d1d91608..5d931149b8 100644 --- a/gnu/installer/tests.scm +++ b/gnu/installer/tests.scm @@ -243,7 +243,7 @@ (define desktop-environments '()) (null? desktop-environments) (find choose-network-management-tool? services)) - ((checkbox-list (title "Other services") (text _) + ((checkbox-list (title "Printing and document services") (text _) (items ,services)) (filter choose-other-service? services)))) From patchwork Mon Dec 27 22:24:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35719 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 3A38627BBEA; Mon, 27 Dec 2021 22:25:51 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 7AA9B27BBE9 for ; Mon, 27 Dec 2021 22:25:50 +0000 (GMT) Received: from localhost ([::1]:43992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1yRB-0003Ab-Ha for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 17:25:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1yQR-0002qq-BV for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1yQR-0002At-1i for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1yQQ-0007Ig-U0 for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47979] [PATCH v7 2/3] installer: Recommend 'ntp-service-type' for non-graphical systems. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 22:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47979@debbugs.gnu.org Received: via spool by 47979-submit@debbugs.gnu.org id=B47979.164064386627989 (code B ref 47979); Mon, 27 Dec 2021 22:25:02 +0000 Received: (at 47979) by debbugs.gnu.org; 27 Dec 2021 22:24:26 +0000 Received: from localhost ([127.0.0.1]:44495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1yPq-0007HH-5p for submit@debbugs.gnu.org; Mon, 27 Dec 2021 17:24:26 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:55477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1yPn-0007Gs-MH for 47979@debbugs.gnu.org; Mon, 27 Dec 2021 17:24:24 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 0225D3201134; Mon, 27 Dec 2021 17:24:17 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 27 Dec 2021 17:24:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=bftX3DDPaUDpIJWT2joryxDqo2k2OwZ+1NvS/qkaQi8=; b=ESC5ttcHSxQh JinDnl6P40tlg98S4eFnveIGwVR/dBsKUph3uqwIQrkzfuOVKhfN51axMIGsigi2 jXODJffBFnlieDhJ8riNfAr/6oN84zp+pyEAy9WvB220ah3GysTGMU7G3KRsIU6j od2G73uP8NCiZpxL6VaM6qSGWd7vPGw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=bftX3DDPaUDpIJWT2joryxDqo2k2OwZ+1NvS/qkaQ i8=; b=JltYQOX+VOMe4HxEQGO4YVDjTc20ifUTRcSOWgZbXaK3WE65hOhxjxKlg b+C2KbuRq5/82soMlfRKQHMyyLu+U0YzXWHt+EhUKZ9WpIuBmWIXjeyICA3yFQJ5 FCbymbgfckF5o7SzQ0De8DvJnxAG9TiHZ6J8PidDPnzKDv4j1b9NpdnOU8sfaLHo 3KYU6uJ6wIoshzGKec4+lqazxquWjA3/ez/j22Zn7WGUluT9+A48N29RCmXf6vSQ WVUFEVGBNyxF+jZ7goJLR9wyVuZRwQ8OXg0WAWw62Sta8VxqsuT75IIsMKGbOjn/ l9SYM2rYmMNCai4ci2Uhjdm6GWGzw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddujedgudegvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhu lhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepfefgfedtgfevteffhffgkeekue ejgeeuveeiieekteehffffkeevgfffgeehffehnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <47979@debbugs.gnu.org>; Mon, 27 Dec 2021 17:24:17 -0500 (EST) From: Leo Famulari Date: Mon, 27 Dec 2021 17:24:09 -0500 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name> References: <422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name> 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" X-getmail-retrieved-from-mailbox: Patches The system test "gui-installed-os" passes with this commit, but "gui-installed-desktop-os-encrypted" fails like this: ------ [...] conversation expecting pattern ((quote checkbox-list) ((quote title) "Network service") ((quote text) _) ((quote items) services)) Dec 27 23:03:44 localhost installer[194]: form # ("Network service"): client 19 replied () Dec 27 23:03:44 localhost installer[194]: running form # ("Network management") with 1 clients conversation expecting pattern ((quote list-selection) ((quote title) "Network management") ((quote multiple-choices?) #f) ((quote items) services)) Dec 27 23:03:44 localhost installer[194]: form # ("Network management"): client 19 replied "DHCP client (dynamic IP address assignment)" Dec 27 23:03:44 localhost installer[194]: running form # ("Console services") with 1 clients conversation expecting pattern ((quote checkbox-list) ((quote title) "Console services") ((quote text) _) ((quote items) services) ((quote null?) (quote desktop-environments))) /gnu/store/bvbv7a5nfzqwq5d7z33kqr8yzx1q5x70-shepherd-marionette.scm:1:1718: ERROR: 1. &pattern-not-matched: pattern: ((quote checkbox-list) ((quote title) "Console services") ((quote text) _) ((quote items) services) ((quote null?) (quote desktop-environments))) sexp: (checkbox-list (title "Console services") (text "Select miscellaneous services to run on your non-graphical system.") (items ("Network time service (NTP), to set the clock automat) Backtrace: 2 (primitive-load "/gnu/store/ipxa2igymg4j2b84ivka5qcp5bs?") In ice-9/eval.scm: 191:35 1 (_ #f) 619:8 0 (_ #(# #)) ice-9/eval.scm:619:8: Throw to key `marionette-eval-failure' with args `((quote (choose-services installer-socket #:choose-desktop-environment? (const #f) #:choose-network-service? (const #f). note: keeping build directory `/tmp/guix-build-installation.drv-9' builder for `/gnu/store/792rdywf5nzn6rs4as5v9la5sdbwqrjp-installation.drv' failed with exit code 1 build of /gnu/store/792rdywf5nzn6rs4as5v9la5sdbwqrjp-installation.drv failed ------ It seems that this page is being run even when a desktop is selected, which does not happen when using the installer directly. Can somebody help me write the system test correctly, so that it's not run when a desktop is selected? We had several bug reports with a root cause of "the clock was incorrect" from users who used the installer to install a non-graphical Guix System. * gnu/installer/services.scm (%system-services): Add the ntp-service-type. * gnu/installer/newt/services.scm (run-system-administration-cbt-page): New variable. (run-services-page): Use run-system-administration-cbt-page when not installing a desktop. * gnu/installer/tests.scm (choose-services): Add and use a choose-misc-service? procedure. * gnu/tests/install.scm (installation-target-os-for-gui-tests): Add ntp-service-type. --- gnu/installer/newt/services.scm | 25 ++++++++++++++++++++++++- gnu/installer/services.scm | 8 ++++++++ gnu/installer/tests.scm | 9 +++++++++ gnu/tests/install.scm | 5 +++-- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm index b4b5219b20..c218825813 100644 --- a/gnu/installer/newt/services.scm +++ b/gnu/installer/newt/services.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,27 @@ (define (run-printing-services-cbt-page) (condition (&installer-step-abort))))))) +(define (run-console-services-cbt-page) + "Run a page to select various system adminstration services for non-graphical +systems." + (let ((items (filter (lambda (service) + (eq? 'administration + (system-service-type service))) + %system-services))) + (run-checkbox-tree-page + #:title (G_ "Console services") + #:info-text (G_ "Select miscellaneous services to run on your \ +non-graphical system.") + #:items items + #:selection (map system-service-recommended? items) + #:item->text (compose G_ system-service-name) + #:checkbox-tree-height 5 + #:exit-button-callback-procedure + (lambda () + (raise + (condition + (&installer-step-abort))))))) + (define (run-network-management-page) "Run a page to select among several network management methods." (let ((title (G_ "Network management"))) @@ -119,6 +141,7 @@ (define (run-services-page) (append desktop (run-networking-cbt-page) (if (null? desktop) - (list (run-network-management-page)) + (cons (run-network-management-page) + (run-console-services-cbt-page)) '()) (run-printing-services-cbt-page)))) diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 341d8b69c8..94c49307f0 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,6 +105,13 @@ (define %system-services (packages '((specification->package "nss-certs"))) (recommended? #t)) + ;; Miscellaneous system administration services. + (system-service + (name (G_ "Network time service (NTP), to set the clock automatically")) + (type 'administration) + (recommended? #t) + (snippet '((service ntp-service-type)))) + ;; Network connectivity management. (system-service (name (G_ "NetworkManager network connection manager")) diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm index 5d931149b8..4175feaed9 100644 --- a/gnu/installer/tests.scm +++ b/gnu/installer/tests.scm @@ -221,7 +221,11 @@ (define* (choose-services port (choose-network-management-tool? (lambda (service) (string-contains service "DHCP"))) + (choose-misc-service? + (lambda (service) + (string-contains service "NTP"))) (choose-other-service? (const #f))) + "Converse over PORT to choose services." (define desktop-environments '()) @@ -243,6 +247,11 @@ (define desktop-environments '()) (null? desktop-environments) (find choose-network-management-tool? services)) + ((checkbox-list (title "Console services") (text _) + (items ,services) + (null? desktop-environments)) + (filter choose-misc-service? services)) + ((checkbox-list (title "Printing and document services") (text _) (items ,services)) (filter choose-other-service? services)))) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 154f98b2e1..ae8c6051f1 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1685,8 +1685,9 @@ (define* (installation-target-os-for-gui-tests (list (swap-space (target (uuid "11111111-2222-3333-4444-123456789abc")))))) - (services (cons (service dhcp-client-service-type) - (operating-system-user-services %minimal-os-on-vda))))) + (services (cons* (service dhcp-client-service-type) + (service ntp-service-type) + (operating-system-user-services %minimal-os-on-vda))))) (define* (installation-target-desktop-os-for-gui-tests #:key (encrypted? #f)) From patchwork Mon Dec 27 22:24:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35718 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 6B28427BBEA; Mon, 27 Dec 2021 22:25:46 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 24D5327BBE9 for ; Mon, 27 Dec 2021 22:25:46 +0000 (GMT) Received: from localhost ([::1]:43814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1yR7-00031k-76 for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 17:25:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1yQR-0002r4-MG for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32953) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1yQR-0002B0-Ck for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1yQR-0007Io-Ai for guix-patches@gnu.org; Mon, 27 Dec 2021 17:25:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47979] [PATCH v7 3/3] installer: Offer 'gpm-service-type' for non-graphical systems. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 22:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47979@debbugs.gnu.org Received: via spool by 47979-submit@debbugs.gnu.org id=B47979.164064387428011 (code B ref 47979); Mon, 27 Dec 2021 22:25:03 +0000 Received: (at 47979) by debbugs.gnu.org; 27 Dec 2021 22:24:34 +0000 Received: from localhost ([127.0.0.1]:44497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1yPx-0007Hh-Qa for submit@debbugs.gnu.org; Mon, 27 Dec 2021 17:24:34 -0500 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]:40251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1yPp-0007Gu-9K for 47979@debbugs.gnu.org; Mon, 27 Dec 2021 17:24:28 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.west.internal (Postfix) with ESMTP id 71F072B001E8; Mon, 27 Dec 2021 17:24:19 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 27 Dec 2021 17:24:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=teqBrmXr5h tyzCkSRaihbWRAnjF8Ly1PRoVmYrVnun8=; b=J/IexXSTMuiyq7uabLsYEYeBBZ Xuw/pvQXs90npKR1inZOeyWWmffpwQ8H2h4cHq8wWFduSzBWiYoNmfY6djQJ1/mJ P1dASV+6EndUXBRdjatqVQSdfX9/zy5a3a4SqWcmXxsZctIxvFiaiESiHS9ZuBaJ Z+m5x9RXND0SREHGU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=teqBrmXr5htyzCkSRaihbWRAnjF8Ly1PRoVmYrVnun8=; b=fr1L1oSI SVfZWEyJUGJQOasNTd4t8hXPQK2SploPV+jl8moAM/ePWeWg8k9NQaPy2E4Zxd0e JZCav+Y3WmSTt2eySflKMT8fvbzQUUSGlDJHdJBeNsUV+TRuhqngdoOz09uK3jFn RNFqHcChgotsySCuguuU3Sd8DwU/E2v0F3I++DajtLLC2dJzz8O0FiEmmk/Uhj1b FK4608vboAsmBzvuZHdZa2LAN1XHtwa5B8pyez8cKybo9EvTx/EaPsUKxL4S8/ia M4QeFE8iII4tSQNBrRUG7CEUtvC7FZjvIlO4WDXL065Fzp/qImeCTOSNzJdMewiz X/kiWcQRB4udnA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddujedgudegvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecuogfvvgigthfqnhhlhidqqdfuphgrmhgsohhtqd gkgedvuddqheduucdlfedttddmnecujfgurhephffvufffkffojghfggfgsedtkeertder tddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrih drnhgrmhgvqeenucggtffrrghtthgvrhhnpefhgeegteeitddvudduveeuhedvhefhfeeh gfehvdfhudegueekhedvhfffhffhgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <47979@debbugs.gnu.org>; Mon, 27 Dec 2021 17:24:18 -0500 (EST) From: Leo Famulari Date: Mon, 27 Dec 2021 17:24:10 -0500 Message-Id: <70c03dd3a7570d5024ba1f3b1a52c7e39cd7ef4e.1640643713.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 In-Reply-To: <422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name> References: <422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/installer/services.scm (%system-services): Add the gpm-service-type. --- gnu/installer/services.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 94c49307f0..be6e75cbc4 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -111,6 +111,10 @@ (define %system-services (type 'administration) (recommended? #t) (snippet '((service ntp-service-type)))) + (system-service + (name (G_ "GPM mouse daemon, to use the mouse in the console")) + (type 'administration) + (snippet '((service gpm-service-type)))) ;; Network connectivity management. (system-service