From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:f42::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YOmuJVnRyGFqHwAAgWs5BA (envelope-from ) for ; Sun, 26 Dec 2021 21:32:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KHpeIlnRyGFEuwAAauVa8A (envelope-from ) for ; Sun, 26 Dec 2021 21:32:25 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2BEC926082 for ; Sun, 26 Dec 2021 21:32:25 +0100 (CET) Received: from localhost ([::1]:42644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1aBs-0001i2-Bp for larch@yhetil.org; Sun, 26 Dec 2021 15:32:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1aBY-0001hO-2X for guix-patches@gnu.org; Sun, 26 Dec 2021 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58318) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1aBW-0000NZ-K6 for guix-patches@gnu.org; Sun, 26 Dec 2021 15:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1aBW-0007ya-GS for guix-patches@gnu.org; Sun, 26 Dec 2021 15:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47979] [PATCH v6 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: Sun, 26 Dec 2021 20:32: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.164055070930622 (code B ref 47979); Sun, 26 Dec 2021 20:32:02 +0000 Received: (at 47979) by debbugs.gnu.org; 26 Dec 2021 20:31:49 +0000 Received: from localhost ([127.0.0.1]:41628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1aBI-0007xp-Od for submit@debbugs.gnu.org; Sun, 26 Dec 2021 15:31:49 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:35857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1aBE-0007xG-O8 for 47979@debbugs.gnu.org; Sun, 26 Dec 2021 15:31:45 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id E88DE3200929; Sun, 26 Dec 2021 15:31:38 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 26 Dec 2021 15:31:39 -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=HBampG0kvWTu9PzRH5owyXrp3UXQO4g2xDHBMB0O5pw=; b=M7jwjHjuHhBZ 5EfOXxOKt3rlWANUPS0do89z7ZCj7GAL4wDH3gpoyQG42vJqSMdCzoi713Zdsuaa PaUnTUH2hJAHQale1Se89NXGK6DX5ixzIhAKNjJ/zjyCkQmAyIWnJFk+g1nkrBef idlE4NOTn9qQQAxhXfDWHUzZFejPMGE= 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=HBampG0kvWTu9PzRH5owyXrp3UXQO4g2xDHBMB0O5 pw=; b=YxoQCAjywUrwlrBpM7FZnvBoGnUfc88NbX5QDiH3pvaC8IBV3iPMhcEvA fowGbUYhnapxtAPI/WnVs6iHmgTUUgru6qujwMfctoayAz/VZYEVIcf+hnFxNYuW CLNtr80v/14Fq2iG6rb/A/Yk/kklsDIKx3yMVsDeRBvfPgzIR1bd8bHANJGA1Hig FpluS78wDJLX8yO/MII6bZH28njXiLRgNdH/3eYkrNU8XkLGSdIMIDvY6nqikZ9K iYFhUMj64Y2akxQc2KpKsJTkMOq4w9/P1+cBUdf2h6xxM6h/z9a05g1syN+smpp1 BP1zQ1+g2PI1f1YtS7+onzUTH9HNA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddugedgjedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeefgfeftdfgveetfffhgfekkeeuje egueevieeikeetheffffekvefgffegheffheenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <47979@debbugs.gnu.org>; Sun, 26 Dec 2021 15:31:38 -0500 (EST) From: Leo Famulari Date: Sun, 26 Dec 2021 15:31:30 -0500 Message-Id: <817dd7dd12e866f87428dcac82fff96e42c4ba77.1640550687.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 In-Reply-To: <18b693c017c779578de0a6a367ebf0eab95c7054.1640550687.git.leo@famulari.name> References: <18b693c017c779578de0a6a367ebf0eab95c7054.1640550687.git.leo@famulari.name> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640550745; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HBampG0kvWTu9PzRH5owyXrp3UXQO4g2xDHBMB0O5pw=; b=Hl5B/c8f0+DTB2tNy4ISpUi5wVyz9GwZnh6yKXJQShamj4NsrYZl/tboW3OVZGDOPBxTVi agRHL32lONNLPI9gv6LxxC6r5l8CtGvKJTBdVTHmMlf49ZXUH9889N7kYQJXHZeoQkRlv0 Mmhc77b3aa5ZN2AudeNbdfxI5+WFQegL4pMMaJUuEfxpoA+vXZ66Nn4zG7cbGNVth/X2aG AUBSttoq3hmFa0e5jxcm7euT+MPjciLRlhV+0DpSXno+UObqoC1h8eAEpNh3uG1MxhFKjW 05n7w1VJduxt48HYL6pZmzYrG+eR8CNexa6aMJgRNMTyT9SdsjbmNl398tPSAQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640550745; a=rsa-sha256; cv=none; b=S3Mg43j3InMzuxGxTj14IVc7IKrcDK3itbWCZNMBKeAD9wXl860qdc5LAXbuT3NU2KvKxS YSU2ooQzxsMT6fcj5Ul9ThuETHurZ0dsj4bMzAdTQmQcoIMj/T1TLl+XL9ye/tMjxc+Pqi YeEPQKP5xtPJOzRJSH8aBNHgRmlrXsDIj2EpDMtwvU81scPWrlRYqEoXYPru6n4cM9NAH5 YWOaU9GSoZ0ihRUAziFjDZDQKBF2xhGyhsage7f/VPKrUmnLY85wHSRE7FCXuN3OhYCTfV 4OvqQoV6tJYLx9MCZfFLGc7eMJ4tmaGWM++VA9JE0ONU+Ln6CO+qt29F3HXYhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=M7jwjHju; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=YxoQCAjy; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=M7jwjHju; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=YxoQCAjy; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2BEC926082 X-Spam-Score: -1.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: eHpj08V91ueh 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 | 10 +++++++++- gnu/tests/install.scm | 5 +++-- 4 files changed, 44 insertions(+), 4 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..39be59f689 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 "Console services") (text _) + (items ,services)) + (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)) -- 2.34.0