From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 0GVhCcbu72PG2wAAbAwnHQ (envelope-from ) for ; Fri, 17 Feb 2023 22:16:54 +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 oAhdCcbu72PrPwEAauVa8A (envelope-from ) for ; Fri, 17 Feb 2023 22:16:54 +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 F0C611BA6F for ; Fri, 17 Feb 2023 22:16:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT85Q-0004Uz-GB; Fri, 17 Feb 2023 16:16:08 -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 1pT85L-0004UB-0d for guix-patches@gnu.org; Fri, 17 Feb 2023 16:16:06 -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 1pT85K-0004Mv-Ny for guix-patches@gnu.org; Fri, 17 Feb 2023 16:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT85K-00005O-JJ for guix-patches@gnu.org; Fri, 17 Feb 2023 16:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61587] [PATCH 3/8] services: connman: Use match-record and export accessors. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 21:16: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.167666852832723 (code B ref 61587); Fri, 17 Feb 2023 21:16:02 +0000 Received: (at 61587) by debbugs.gnu.org; 17 Feb 2023 21:15:28 +0000 Received: from localhost ([127.0.0.1]:41711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT84l-0008Vi-KY for submit@debbugs.gnu.org; Fri, 17 Feb 2023 16:15:27 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:36862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT84j-0008Va-Na for 61587@debbugs.gnu.org; Fri, 17 Feb 2023 16:15:26 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 4374D2090F for <61587@debbugs.gnu.org>; Fri, 17 Feb 2023 22:15:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E1FC78009A; Fri, 17 Feb 2023 22:15:24 +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 YRy2R1fH6DwZ; Fri, 17 Feb 2023 22:15:24 +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 756A980098; Fri, 17 Feb 2023 22:15:24 +0100 (CET) From: Bruno Victal Date: Fri, 17 Feb 2023 21:14:54 +0000 Message-Id: <6e0343b6f71b6fda9ef58c0b1f21fc83a472df44.1676667941.git.mirai@makinata.eu> 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: 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676668614; a=rsa-sha256; cv=none; b=tcpGPiLEaGEbfkBTsBttQqKI14DIlYORl5sccQ2+sKkZSY2jC0NE63ntTpSab6dFhz9gvr omIftx/5iWCr/HcjMCJcG4XVoeT9cRuTe7S+JRqVODxAzAof18DOj0eWPsXMCooVsFDO8p mhkYv3LGij8Nx+EXZAdUF4KClkcBEnK/JoH0lzdI4rOlYtJM67igOTDNxqIdrWLlp9xD7M P31IeTKY4fHcr/yM2dPHcjqWsmD+hDWAyXW0VZcevM/IiV6T+JtRT9yaasJY4MPwTzpUsS YeuF2wKNzyu9Y06ojKEEMCUY5kuVu98T9ItYYnLKDozpzWUZkCzpk810gikb6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676668614; 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=lWQVi9weJuf1TwvQNJJGcoNkDy38n8spwKK/UdiBdqY=; b=FPujeo0Y6+Kv/WxqCRZ+OWS4z8FphifTuOdNcbYZQ2CvC7TLg+/Zl1K402ek+TG8KC8483 WMenBQz1fceuNTz/NmwDLW8Vg475vE9hX3DCfWDfWJLbYmtGzX0SAfx98tZxtBq2fYTHK2 ON9UPrtOf5sjTK7+Bdf41hbtK26ge2THVgRnbRCufoPae4iN3/j+BxWSIEzaOYi1Skk+14 1hjgy2XhyA4z/TYCd+RZyZWSERLvX3sMxIUIXoK/CLdi9d608PhbrGboE249HyJ8q68Yie P4kbFKzNY7Tdx2FwBPf7ZCmDcDE+Uc2piXSH2VEiEtiWM2tJ258nlk40HMB25Q== Authentication-Results: aspmx1.migadu.com; dkim=none; 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.63 X-Spam-Score: -1.63 X-Migadu-Queue-Id: F0C611BA6F X-Migadu-Scanner: scn1.migadu.com X-TUID: KpUd7W0eQZ0z * gnu/services/networking.scm (connman-shepherd-service): Use match-record. (connman-configuration-connman, connman-configuration-disable-vpn?) (connman-configuration-iwd?): Export accessors. --- gnu/services/networking.scm | 52 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index ddf2e20791..5cba3a9a3f 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -150,6 +150,9 @@ (define-module (gnu services networking) connman-configuration connman-configuration? + connman-configuration-connman + connman-configuration-disable-vpn? + connman-configuration-iwd? connman-service-type modem-manager-configuration @@ -1300,33 +1303,28 @@ (define (connman-activation config) (mkdir-p "/var/lib/connman-vpn/")))))) (define (connman-shepherd-service config) - "Return a shepherd service for Connman" - (and - (connman-configuration? config) - (let ((connman (connman-configuration-connman config)) - (disable-vpn? (connman-configuration-disable-vpn? config)) - (iwd? (connman-configuration-iwd? config))) - (list (shepherd-service - (documentation "Run Connman") - (provision '(networking)) - (requirement - (append '(user-processes dbus-system loopback) - (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))))))) + (match-record config (connman disable-vpn? iwd?) + (list (shepherd-service + (documentation "Run Connman") + (provision '(networking)) + (requirement + (append '(user-processes dbus-system loopback) + (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