From: Leo Famulari <leo@famulari.name>
To: 47979@debbugs.gnu.org
Subject: [bug#47979] [PATCH v7 1/3] installer: Offer the CUPS printing service on a dedicated page.
Date: Mon, 27 Dec 2021 17:24:08 -0500 [thread overview]
Message-ID: <422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name> (raw)
In-Reply-To: <b0a1ebc01ab84f43d5bddff5f54cea44dc04e513.1619203994.git.leo@famulari.name>
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))))
--
2.34.0
next prev parent reply other threads:[~2021-12-27 22:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 18:53 [bug#47979] [PATCH] installer: Recommend 'ntp-service-type' for non-graphical systems Leo Famulari
2021-04-23 18:56 ` Leo Famulari
2021-04-23 22:45 ` Leo Famulari
2021-04-23 23:20 ` Leo Famulari
2021-04-24 0:56 ` [bug#47979] [PATCH v3] " Leo Famulari
2021-05-02 4:36 ` Leo Famulari
2021-05-02 9:25 ` Mathieu Othacehe
2021-05-02 15:22 ` Leo Famulari
2021-05-21 12:58 ` [bug#47979] [PATCH] " Mathieu Othacehe
2021-05-21 13:37 ` Leo Famulari
2021-05-21 14:21 ` Leo Famulari
2021-05-21 14:26 ` Leo Famulari
2021-05-21 14:39 ` Mathieu Othacehe
2021-05-21 21:01 ` Leo Famulari
2021-05-21 21:44 ` Leo Famulari
2021-06-01 9:49 ` Mathieu Othacehe
2021-12-24 18:04 ` [bug#47979] [PATCH v5] gnu: binutils: Fix CVE-2021-45078 Leo Famulari
2021-12-24 18:04 ` [bug#47979] [PATCH v5 1/2] installer: Recommend 'ntp-service-type' for non-graphical systems Leo Famulari
2021-12-24 18:04 ` [bug#47979] [PATCH v5 2/2] installer: Offer 'gpm-service-type' " Leo Famulari
2021-12-24 18:14 ` [bug#47979] [PATCH v5 1/2] installer: Recommend 'ntp-service-type' " Leo Famulari
2021-12-26 20:31 ` [bug#47979] [PATCH v6 1/3] installer: Offer the CUPS printing service on a dedicated page Leo Famulari
2021-12-26 20:31 ` [bug#47979] [PATCH v6 2/3] installer: Recommend 'ntp-service-type' for non-graphical systems Leo Famulari
2021-12-26 20:33 ` Leo Famulari
2021-12-26 21:06 ` Mathieu Othacehe
2021-12-27 0:57 ` Leo Famulari
2021-12-26 20:31 ` [bug#47979] [PATCH v6 3/3] installer: Offer 'gpm-service-type' " Leo Famulari
2021-12-27 22:24 ` Leo Famulari [this message]
2021-12-27 22:24 ` [bug#47979] [PATCH v7 2/3] installer: Recommend 'ntp-service-type' " Leo Famulari
2021-12-27 23:53 ` Leo Famulari
2021-12-28 4:54 ` Leo Famulari
2021-12-28 8:27 ` Mathieu Othacehe
2021-12-28 20:34 ` bug#47979: " Leo Famulari
2021-12-27 22:24 ` [bug#47979] [PATCH v7 3/3] installer: Offer 'gpm-service-type' " Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=422b32c84a0ae293398777f5233565b9c282d5da.1640643713.git.leo@famulari.name \
--to=leo@famulari.name \
--cc=47979@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).