From patchwork Fri Dec 24 18:04:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35637 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 B83F127BBE9; Fri, 24 Dec 2021 18:05:39 +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 1A8A627BBEA for ; Fri, 24 Dec 2021 18:05:39 +0000 (GMT) Received: from localhost ([::1]:51972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0owk-0007mV-61 for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 13:05:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0owA-0007kL-TX for guix-patches@gnu.org; Fri, 24 Dec 2021 13:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0owA-0001O7-L6 for guix-patches@gnu.org; Fri, 24 Dec 2021 13:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0owA-0004wf-E9 for guix-patches@gnu.org; Fri, 24 Dec 2021 13:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47979] [PATCH v5 1/2] installer: Recommend 'ntp-service-type' for non-graphical systems. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Dec 2021 18:05: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.164036909318972 (code B ref 47979); Fri, 24 Dec 2021 18:05:02 +0000 Received: (at 47979) by debbugs.gnu.org; 24 Dec 2021 18:04:53 +0000 Received: from localhost ([127.0.0.1]:38010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0ow1-0004vr-84 for submit@debbugs.gnu.org; Fri, 24 Dec 2021 13:04:53 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:43651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0ovz-0004vb-Ah for 47979@debbugs.gnu.org; Fri, 24 Dec 2021 13:04:51 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id B2721320187F; Fri, 24 Dec 2021 13:04:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 24 Dec 2021 13:04:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=ITjdwy6X/ot6Wq7hPo7oPVE 0pyphwLn0/q/gZGuffxU=; b=gF1TsYDNOPmPOiKtE8mowT03SI7lTfwqVSKLKPv pmGvIVIPhAyJXWcItCRwOHLkrLqKf035AmPUvey503+P2SQF4P86MUBadjIczuuP Qemxkofq7QAZULBI94Qp0mpm5LZE/hklVAfCv8Ax1U9xUXUXFhcWLUPOM4mMb1ZI HMAI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :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=ITjdwy 6X/ot6Wq7hPo7oPVE0pyphwLn0/q/gZGuffxU=; b=ZgikOMOQfsjgwHpCVVHwD9 7epr0bdYclhBPaa9/r2EyeN0SH7m8mkLiMSw1lvKs2IQgdDyRGCvk8TCY7abMV/D KkISDAWGZ9RaJFOuCAcoDba0MFExgb/xLnjQLEDxqClzefNSrjkvubtZtnp0Xbj7 N8aORf/5v2x5TYCEYr3frb4BZVNoAt0l1/ftGFuU/u2QFz6VuC31kQGv2iVIkVJr URfULp3/j22zJjXag8W+B/so601rbPoBbeYN27aS7MNIT+SS7takMJlNahyPyDfG K5+FusseT8t8eSL/Jlp6YtLuEBtL0ZxvPhVaeV963iTWUafVJybVMIHZtpt+hplA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddutddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepgfetjeetjedtfefggfelheevleejte fhleevveetkedtheeugedtgfekueekheejnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <47979@debbugs.gnu.org>; Fri, 24 Dec 2021 13:04:44 -0500 (EST) From: Leo Famulari Date: Fri, 24 Dec 2021 13:04:40 -0500 Message-Id: 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 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 | 23 ++++++++++++++++++++++- gnu/installer/services.scm | 8 ++++++++ gnu/installer/tests.scm | 10 +++++++++- gnu/tests/install.scm | 5 +++-- 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm index 1af4e7df2d..56cb3f6787 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. ;;; @@ -90,6 +91,25 @@ (define (run-other-services-cbt-page) (condition (&installer-step-abort))))))) +(define (run-system-administration-cbt-page) + "Run a page to select various system adminstration services." + (let ((items (filter (lambda (service) + (eq? 'administration + (system-service-type service))) + %system-services))) + (run-checkbox-tree-page + #:title (G_ "Miscellaneous services") + #:info-text (G_ "Select miscellaneous services to run on your 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"))) @@ -121,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-system-administration-cbt-page)) '()) (run-other-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 12d1d91608..dc2371ce97 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-other-service? (const #f))) + (choose-other-service? (const #f)) + (choose-misc-service? + (lambda (service) + (string-contains service "NTP")))) + "Converse over PORT to choose services." (define desktop-environments '()) @@ -243,6 +247,10 @@ (define desktop-environments '()) (null? desktop-environments) (find choose-network-management-tool? services)) + ((checkbox-list (title "Miscellaneous services") (text _) + (items ,services)) + (filter choose-misc-service? services)) + ((checkbox-list (title "Other 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 Fri Dec 24 18:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35636 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 3FEB227BBE9; Fri, 24 Dec 2021 18:05:39 +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 1196E27BBE9 for ; Fri, 24 Dec 2021 18:05:39 +0000 (GMT) Received: from localhost ([::1]:51996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0owk-0007nW-6b for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 13:05:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0owB-0007kU-99 for guix-patches@gnu.org; Fri, 24 Dec 2021 13:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0owB-0001OG-0S for guix-patches@gnu.org; Fri, 24 Dec 2021 13:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0owA-0004wo-Sw for guix-patches@gnu.org; Fri, 24 Dec 2021 13:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47979] [PATCH v5 2/2] 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: Fri, 24 Dec 2021 18:05: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.164036909718985 (code B ref 47979); Fri, 24 Dec 2021 18:05:02 +0000 Received: (at 47979) by debbugs.gnu.org; 24 Dec 2021 18:04:57 +0000 Received: from localhost ([127.0.0.1]:38012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0ow4-0004w9-RD for submit@debbugs.gnu.org; Fri, 24 Dec 2021 13:04:57 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:54083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0ow1-0004ve-0H for 47979@debbugs.gnu.org; Fri, 24 Dec 2021 13:04:53 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 618663201487; Fri, 24 Dec 2021 13:04:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 24 Dec 2021 13:04:47 -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=K5FuuSfwi96r/1ksszb5Y49wIR NeGTu9bfy+hN4eEXuY32ZdgSm9TmqwW1VfHxcMTuEFvsIN5J/a9genYNpUjyL0+0 TgnWcJW1Nd5G7CfDiKueGtvt1AZznSkf3+ZZO7AbnbyLk2Luf+eW6Whuig1GFTwk Tz6BiA5R5FoSXest8= 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=Sqt9iWuy FGwjb7Puoy+atxmkzGS6wNbaTnMs4650CFW8HWuLU3ORzICdRmBJb9xXPpSvT0eg GoBXJzaK5fy8R2LE7h4fbR80F9yZkwPZnX5Nj/6QWlFfdevdJZFM5/y5FdFRsubY ERoInWC0CYJSJHeX74emjmS0NEi9BgWxVrTGoyVjAWo2IUyArPhoeZWYadyDh1X1 JVaQfyidmKCw+pkiUQdszW6QCoaOfFI+mLjFU8jnaKPVNwuHaBXuRaeeOq8KS3IX kk4O7UzLNlFrZ/PD9L1XkJNb9sDNkKcpKk+2uaLlGNV5VW7N3O9jvF/mFdOhGnve gniPkeorKsKYaw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddutddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpefhgeegteeitddvudduveeuhedvhe fhfeehgfehvdfhudegueekhedvhfffhffhgeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <47979@debbugs.gnu.org>; Fri, 24 Dec 2021 13:04:46 -0500 (EST) From: Leo Famulari Date: Fri, 24 Dec 2021 13:04:41 -0500 Message-Id: <3f4e7ef8e9e4088cd567d6c0b6d5effa7daf59c9.1640369080.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 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" 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