summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorOliver Charles <ollie@ocharles.org.uk>2014-02-12 11:29:18 +0000
committerOliver Charles <ollie@ocharles.org.uk>2014-02-12 11:32:49 +0000
commit625b42838a7faf4d1cf72c98963c7d96fe36405f (patch)
tree009b3cc66e971a0caf4052ac8d3cf4ab4bd2ddc2 /nixos/modules/services
parent7271eb50e6e4f70dd8a0b78a9894efacf17274f7 (diff)
downloadnixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar
nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.gz
nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.bz2
nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.lz
nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.xz
nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.zst
nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.zip
NetworkManager: Fix aliases and dependencies
There are two fixes in this commit.

Firstly, I am creating proper symlinks for the Alias= definitions in the
.service files. This achieves the same result as `systemctl enable`, and
I think is preferred over `mv`.

Secondly, `networkmanager-init` now wants `NetworkManager.service`,
along with `ModemManager.service`. ModemManager does not depend on
NetworkManager (according to `systemctl list-dependencies ModemManager`),
thus NetworkManager never got started on boot.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2db96d9cd31e..e5213c7fccf3 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -89,7 +89,7 @@ in {
           to change network settings to this group.
         '';
       };
-  
+
       packages = mkOption {
         type = types.listOf types.path;
         default = [ ];
@@ -178,7 +178,7 @@ in {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
       partOf = [ "NetworkManager.service" ];
-      wants = [ "ModemManager.service" ];
+      wants = [ "ModemManager.service" "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections