From patchwork Sun Jul 7 19:28:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14501 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 43C74171C5; Sun, 7 Jul 2019 20:30:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 028B71716C for ; Sun, 7 Jul 2019 20:30:25 +0100 (BST) Received: from localhost ([::1]:36698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrg-0004TH-MX for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48844) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrN-0004H4-UA for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrM-0008Jz-Gb for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrM-0008JM-7Q for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrM-0005RG-1n for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 2/6] services: network-manager: Properly load vpn plugins Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36542@debbugs.gnu.org Received: via spool by 36542-submit@debbugs.gnu.org id=B36542.156252774920739 (code B ref 36542); Sun, 07 Jul 2019 19:30:03 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:09 +0000 Received: from localhost ([127.0.0.1]:57436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqS-0005OQ-JD for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:08 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqR-0005OD-4D for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:07 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:44 +0200 Message-Id: <20190707192848.10049-2-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <20190707192848.10049-1-jlicht@fsfe.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Extends the dbus service when vpn plugins are enabled. * gnu/services/networking.scm (network-manager-service-type): Load vpn plugins when extending dbus service. --- gnu/services/networking.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 13cffd9feb..7423bac1aa 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -942,24 +943,27 @@ and @command{wicd-curses} user interfaces." (define network-manager-service-type (let - ((config->package + ((config->packages (match-lambda - (($ network-manager) - (list network-manager))))) + (($ network-manager _ vpn-plugins) + `(,network-manager ,@vpn-plugins))))) (service-type (name 'network-manager) (extensions (list (service-extension shepherd-root-service-type network-manager-shepherd-service) - (service-extension dbus-root-service-type config->package) - (service-extension polkit-service-type config->package) + (service-extension dbus-root-service-type config->packages) + (service-extension polkit-service-type + (compose + list + network-manager-configuration-network-manager)) (service-extension activation-service-type network-manager-activation) (service-extension session-environment-service-type network-manager-environment) ;; Add network-manager to the system profile. - (service-extension profile-service-type config->package))) + (service-extension profile-service-type config->packages))) (default-value (network-manager-configuration)) (description "Run @uref{https://wiki.gnome.org/Projects/NetworkManager,