diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
| commit | 64de896a71a9ba3091259834077d54c0146bdab6 (patch) | |
| tree | da58cc584fcc42a2b04f692aa3b1ada4c8949f5e /gnu/services/networking.scm | |
| parent | 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff) | |
| parent | 6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff) | |
| download | patches-64de896a71a9ba3091259834077d54c0146bdab6.tar patches-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/networking.scm')
| -rw-r--r-- | gnu/services/networking.scm | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 13cffd9feb..376b4ccc4e 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> +;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -937,29 +938,35 @@ and @command{wicd-curses} user interfaces." "--no-daemon") #:environment-variables (list (string-append "NM_VPN_PLUGIN_DIR=" #$vpn - "/lib/NetworkManager/VPN")))) + "/lib/NetworkManager/VPN") + ;; Override non-existent default users + "NM_OPENVPN_USER=" + "NM_OPENVPN_GROUP="))) (stop #~(make-kill-destructor)))))))) (define network-manager-service-type (let - ((config->package + ((config->packages (match-lambda - (($ <network-manager-configuration> network-manager) - (list network-manager))))) + (($ <network-manager-configuration> 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, |