From 044af5efa3398741e2844b6d34a525c223f473c1 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 6 Mar 2024 14:50:08 +0100
Subject: [PATCH] hostapd: use trailing newlines rather than separating ones

---
 modules/hostapd/service.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/hostapd/service.nix b/modules/hostapd/service.nix
index 2bd54530..a620124a 100644
--- a/modules/hostapd/service.nix
+++ b/modules/hostapd/service.nix
@@ -7,7 +7,7 @@
 { interface, params} :
 let
   inherit (liminix.services) longrun;
-  inherit (lib) concatStringsSep mapAttrsToList;
+  inherit (lib) concatStrings mapAttrsToList;
   inherit (liminix.lib) typeChecked;
   inherit (lib) mkOption types;
 
@@ -22,15 +22,14 @@ let
     driver = "nl80211";
     logger_syslog = "-1";
     logger_syslog_level = 1;
-    ctrl_interface = "/run/hostapd";
+    ctrl_interface = "/run/hostapd.${name}";
     ctrl_interface_group = 0;
   };
 
   conf = writeText "hostapd.conf"
-    (concatStringsSep
-      "\n"
+    (concatStrings
       (mapAttrsToList
-        (name: value: "${name}=${toString value}")
+        (name: value: "${name}=${toString value}\n")
         (defaults // params)));
 in longrun {
   inherit name;