summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2016-02-27 02:55:31 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2016-02-27 02:55:31 +0300
commit766ad682f146a755b460dd87006912a96d915bcd (patch)
tree0a618deb9d080fed6daa6b752699c45617fe118a /nixos
parent6d111b353f9fd0f4a504988a3da57ee42808c201 (diff)
parent70c02402c8cefa163db39adb2e676196e0aa5dcf (diff)
downloadnixlib-766ad682f146a755b460dd87006912a96d915bcd.tar
nixlib-766ad682f146a755b460dd87006912a96d915bcd.tar.gz
nixlib-766ad682f146a755b460dd87006912a96d915bcd.tar.bz2
nixlib-766ad682f146a755b460dd87006912a96d915bcd.tar.lz
nixlib-766ad682f146a755b460dd87006912a96d915bcd.tar.xz
nixlib-766ad682f146a755b460dd87006912a96d915bcd.tar.zst
nixlib-766ad682f146a755b460dd87006912a96d915bcd.zip
Merge pull request #13471 from Profpatsch/networkmanager-link-local
networkmanager: fix link-local ip addresses
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/misc/ids.nix1
-rw-r--r--nixos/modules/services/networking/networkmanager.nix5
2 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index f3883ff56d34..6ae37f273df0 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -252,6 +252,7 @@
       gammu-smsd = 228;
       pdnsd = 229;
       octoprint = 230;
+      avahi-autoipd = 231;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 01c05fb4a245..eb2b9d692f8d 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -228,6 +228,11 @@ in {
     users.extraUsers = [{
       name = "nm-openvpn";
       uid = config.ids.uids.nm-openvpn;
+    }
+    {
+      # to enable link-local connections
+      name = "avahi-autoipd";
+      uid = config.ids.uids.avahi-autoipd;
     }];
 
     systemd.packages = cfg.packages;