From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4ea1::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +O+eN289ymF/WAAAgWs5BA (envelope-from ) for ; Mon, 27 Dec 2021 23:25:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QLyfMW89ymEiigAAG6o9tA (envelope-from ) for ; Mon, 27 Dec 2021 23:25:51 +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 665331528 for ; Mon, 27 Dec 2021 23:25:51 +0100 (CET) Received: from localhost ([::1]:43992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1yRC-0003Ab-JZ for larch@yhetil.org; Mon, 27 Dec 2021 17:25:50 -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 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=1640643951; 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=bftX3DDPaUDpIJWT2joryxDqo2k2OwZ+1NvS/qkaQi8=; b=q+Pj46Yh386w6+oRHFwID3AzwUnx2yIDFeLLet62BEs4Q5kyv0GYwVgWLdXsuslV0hgrvL oT+Ew42yLsEiwPUzDj+XVvfrYyqqVd3iyEG0r6+F0IoR2PW4ccCSAXkjxWAuKk0c5sD23H 3FQ3JEz+hHa5DvlE63fPW/E6VGh4Q5nGC2ADVmGjbJxn0jt5w/kLq8lHjIlGGE00vmeg1/ /u4GhSIpyNZQzgjcjrJ6Z8KTG3IcoGqL7VkGDqcZmdF+GpxR0VouKg/cyhRMsk1mDU+s3y K82KhI4WflmD6oZq1WUyqseLPsMJ5ag73qWPM5ySezwLPz9v5aXOU+KasLMyrw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640643951; a=rsa-sha256; cv=none; b=fi5GOjb3NwEHqhQMZP8XEpWHj/nK2yRsy/bvfT0+uGWRNMPoGT3xocKIlrIhxLKWgucxBd PyQqySh5wJoRoPCrjGfHBwzLfaQ7hTUpLF/auL3qrMRo+HS7KyVjAI/XC/cHIPUzmZAN1/ Y8G3x4a6ezoGhDBtkN+CY116JeyBwem/Arwr7VU69XIUEkCQXTN3ACUe5rbYCYyy5TBTej WPpL3Wor5E5psEjr/zZ5CfC33+X6sPDXM8rLoBOHT/w4c/o6gucj9TXsW/dkAMBZgX2Qfu 0VdWBIXntLW/v49Mv1HHEVfbTpKjcxX5RQXOaWeCj3FGfeXvs67hmowpMtmYHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=ESC5ttcH; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=JltYQOX+; 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=ESC5ttcH; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=JltYQOX+; 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: 665331528 X-Spam-Score: -1.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: TiDrDnP6i4eB 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)) -- 2.34.0