From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eASPJsjw72P+0QAAbAwnHQ (envelope-from ) for ; Fri, 17 Feb 2023 22:25:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OCW0Jcjw72O1+wAAG6o9tA (envelope-from ) for ; Fri, 17 Feb 2023 22:25:28 +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 4BAA21BE64 for ; Fri, 17 Feb 2023 22:25:28 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676669128; a=rsa-sha256; cv=none; b=h3s+C6sYtrKO2t+wncgDx9xf9QNzlmZoAMYdsSmocKq8ckkPzsJb5ogAZ5TDJ1yvcNA9C4 5f+gC7G7a2gyQs3twE0wsqv2iF7hNOda7yTCaLDtllagjZOAzqYyn/Cz8dPPWwIDAmV0N3 2RteneAs5HQtiP0XXpz0msJXmk4Egjrw0JILBorx9FtBGjbUID7UkdseHRUx9MaoR+fcN3 td1o7oH0y2Nm/2SO/AFterGKnZ5jM5i07DcPytsf3FKHcTS1SRAsSgosv6EWnuGTXqZDFX X4hwGKHH9+I9qIm456QYY6da3oI5mPlGJmokwAuT3hAl6Qds2/mk6aNbdhF0mQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676669128; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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; bh=7o7Wu8vbu/mG0D5XZk22bZXXRy/FVIivCW+K4EwAsIk=; b=lgSzg1cXG+X1DTF0KGeG3TtxYIKhNdrCy8YJOYA2omqRoq40bSHBDvGfEL6NsnRY7BjlHt S5T2/o5T1IVUvJwsRN7Kvc0lbYtr4MuC4ChlOsL4RrWlLpoLRi3ecTOpF4D32xaWuVN3fp v11saWwcCyOK2LpfkTCTVtqjGyIyb25QqUM8VEPYR1SKMnh/IYomuZMKYsfi/KsAWGUxzp Ej8odk6TtrjMOVkw9aHlcsm+GbUwwbpvVJCpZO25Q1H7xrReXbCiE3pBQCDxkrEP2LX2VT 5GenJF7lFq6zcEFtA6gj6ZmWFn4ndZ04ko5SmV5ZjzYx5IB0zLGjTAF/1mv/xw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT8EJ-0000VD-OM; Fri, 17 Feb 2023 16:25:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pT8E6-0000SN-QO for guix-patches@gnu.org; Fri, 17 Feb 2023 16:25:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT8E2-0005lx-CC for guix-patches@gnu.org; Fri, 17 Feb 2023 16:25:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT8E2-0000Ki-6j for guix-patches@gnu.org; Fri, 17 Feb 2023 16:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61587] [PATCH 5/8] services: connman: Deprecate 'iwd?' field. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61587@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61587-submit@debbugs.gnu.org id=B61587.16766690701233 (code B ref 61587); Fri, 17 Feb 2023 21:25:02 +0000 Received: (at 61587) by debbugs.gnu.org; 17 Feb 2023 21:24:30 +0000 Received: from localhost ([127.0.0.1]:41738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT8DW-0000Jo-9k for submit@debbugs.gnu.org; Fri, 17 Feb 2023 16:24:30 -0500 Received: from smtpmciv7.myservices.hosting ([185.26.106.202]:50534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT8DU-0000Jg-DP for 61587@debbugs.gnu.org; Fri, 17 Feb 2023 16:24:28 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv7.myservices.hosting (Postfix) with ESMTP id B178920D82 for <61587@debbugs.gnu.org>; Fri, 17 Feb 2023 22:24:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B246B8009A; Fri, 17 Feb 2023 22:15:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8wkCui65d21P; Fri, 17 Feb 2023 22:15:57 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 48A1680098; Fri, 17 Feb 2023 22:15:57 +0100 (CET) From: Bruno Victal Date: Fri, 17 Feb 2023 21:14:56 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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: X-Migadu-Queue-Id: 4BAA21BE64 X-Spam-Score: -2.63 X-Migadu-Spam-Score: -2.63 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-TUID: AlznCe3oL2I4 * gnu/services/networking.scm () [iwd?]: Use helper to warn deprecated field. (connman-shepherd-service): Make iwd? a local variable independent from the deprecated field. * doc/guix.texi (Networking Setup): Remove mention of iwd? field. --- doc/guix.texi | 2 -- gnu/services/networking.scm | 50 +++++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0a0080b117..67c518ca7d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19794,8 +19794,6 @@ Networking Setup @item @code{disable-vpn?} (default: @code{#f}) When true, disable connman's vpn plugin. -@item @code{iwd?} (default: @code{#f}) -When true, ConnMan uses iwd to connect to wireless networks. @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 30a4d6a6d8..13816327b0 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1294,7 +1294,8 @@ (define-record-type* (disable-vpn? connman-configuration-disable-vpn? (default #f)) (iwd? connman-configuration-iwd? - (default #f))) + (default #f) + (sanitize warn-iwd?-field-deprecation))) (define (connman-activation config) (let ((disable-vpn? (connman-configuration-disable-vpn? config))) @@ -1308,27 +1309,32 @@ (define (connman-activation config) (define (connman-shepherd-service config) (match-record config (connman shepherd-requirement disable-vpn? iwd?) - (list (shepherd-service - (documentation "Run Connman") - (provision '(networking)) - (requirement `(user-processes dbus-system loopback - ,@shepherd-requirement - ,@(if iwd? '(iwd) '()))) - (start #~(make-forkexec-constructor - (list (string-append #$connman - "/sbin/connmand") - "--nodaemon" - "--nodnsproxy" - #$@(if disable-vpn? '("--noplugin=vpn") '()) - #$@(if iwd? '("--wifi=iwd_agent") '())) - - ;; As connman(8) notes, when passing '-n', connman - ;; "directs log output to the controlling terminal in - ;; addition to syslog." Redirect stdout and stderr - ;; to avoid spamming the console (XXX: for some reason - ;; redirecting to /dev/null doesn't work.) - #:log-file "/var/log/connman.log")) - (stop #~(make-kill-destructor)))))) + (let ((iwd? (or iwd? ; TODO: deprecated field, remove later. + (and shepherd-requirement + (memq 'iwd shepherd-requirement))))) + (list (shepherd-service + (documentation "Run Connman") + (provision '(networking)) + (requirement `(user-processes dbus-system loopback + ,@shepherd-requirement + ;; TODO: iwd? is deprecated and should be passed + ;; with shepherd-requirement, remove later. + ,@(if iwd? '(iwd) '()))) + (start #~(make-forkexec-constructor + (list (string-append #$connman + "/sbin/connmand") + "--nodaemon" + "--nodnsproxy" + #$@(if disable-vpn? '("--noplugin=vpn") '()) + #$@(if iwd? '("--wifi=iwd_agent") '())) + + ;; As connman(8) notes, when passing '-n', connman + ;; "directs log output to the controlling terminal in + ;; addition to syslog." Redirect stdout and stderr + ;; to avoid spamming the console (XXX: for some reason + ;; redirecting to /dev/null doesn't work.) + #:log-file "/var/log/connman.log")) + (stop #~(make-kill-destructor))))))) (define %connman-log-rotation (list (log-rotation -- 2.39.1