From patchwork Mon Jun 26 21:59:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51373 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 CE1A327BBE9; Mon, 26 Jun 2023 23:02:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 7FA8827BBE2 for ; Mon, 26 Jun 2023 23:02:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDuGp-0005SR-Jb; Mon, 26 Jun 2023 18:01:15 -0400 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 1qDuGk-00052t-6a for guix-patches@gnu.org; Mon, 26 Jun 2023 18:01:11 -0400 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 1qDuGg-0005XO-QT for guix-patches@gnu.org; Mon, 26 Jun 2023 18:01:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDuGg-0008Tl-MO for guix-patches@gnu.org; Mon, 26 Jun 2023 18:01:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63985] [PATCH v3 11/11] services: NetworkManager: Add extra-options field. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Jun 2023 22:01:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63985 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63985@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 63985-submit@debbugs.gnu.org id=B63985.168781686632586 (code B ref 63985); Mon, 26 Jun 2023 22:01:06 +0000 Received: (at 63985) by debbugs.gnu.org; 26 Jun 2023 22:01:06 +0000 Received: from localhost ([127.0.0.1]:47204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDuGf-0008TK-L3 for submit@debbugs.gnu.org; Mon, 26 Jun 2023 18:01:06 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:34376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDuGS-0008Rw-Qj for 63985@debbugs.gnu.org; Mon, 26 Jun 2023 18:00:53 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 6769320E6F for <63985@debbugs.gnu.org>; Tue, 27 Jun 2023 00:00:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C28258009B; Tue, 27 Jun 2023 00:00:51 +0200 (CEST) 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 0OtqaWwF1hKi; Tue, 27 Jun 2023 00:00:51 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 5A4548009A; Tue, 27 Jun 2023 00:00:51 +0200 (CEST) From: Bruno Victal Date: Mon, 26 Jun 2023 22:59:37 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (network-manager-configuration) [extra-options]: New field. * doc/guix.texi (Networking Setup): Document it. --- doc/guix.texi | 7 +++++++ gnu/services/networking.scm | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 76bd1b1413..a74718f216 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20413,6 +20413,13 @@ Networking Setup (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN. +@item @code{extra-options} (default: @code{'()}) (type: list-of-ini-entries) +Additional options to be appended to @file{NetworkManager.conf} (run +@samp{man networkmanager.conf} for more information). It expects a list +whose elements are lists of the form @code{'(@var{section} @var{key} +@var{value})}, where @var{section} and @var{key} are symbols and +@var{value} is a string. + @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 33ff5e040f..4cb1cd60cb 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -179,6 +179,7 @@ (define-module (gnu services networking) network-manager-configuration-log-configuration network-manager-configuration-dns network-manager-configuration-vpn-plugins + network-manager-configuration-extra-options network-manager-service-type connman-configuration @@ -1340,6 +1341,14 @@ (define-configuration network-manager-configuration package, which allows NetworkManager to manage VPNs @i{via} OpenVPN." empty-serializer) + (extra-options + (list-of-ini-entries '()) + "Additional options to be appended to @file{NetworkManager.conf} (run +@samp{man networkmanager.conf} for more information). +It expects a list whose elements are lists of the form +@code{'(@var{section} @var{key} @var{value})}, where @var{section} and +@var{key} are symbols and @var{value} is a string.") + ;; Deprecated options (iwd? (boolean #f)