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))))