Merge pull request #9825 from ericsagnes/connman-conf

connman: improved configuration
This commit is contained in:
Matej Cotman 2015-09-13 14:30:33 +02:00
commit 8a79bdddf8

View file

@ -5,7 +5,12 @@ with lib;
let
cfg = config.networking.connman;
configFile = pkgs.writeText "connman.conf" ''
[General]
NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist}
${cfg.extraConfig}
'';
in {
###### interface
@ -22,6 +27,23 @@ in {
'';
};
extraConfig = mkOption {
type = types.lines;
default = ''
'';
description = ''
Configuration lines appended to the generated connman configuration file.
'';
};
networkInterfaceBlacklist = mkOption {
type = with types; listOf string;
default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ];
description = ''
Default blacklisted interfaces, this includes NixOS containers interfaces (ve).
'';
};
};
};
@ -51,7 +73,7 @@ in {
Type = "dbus";
BusName = "net.connman";
Restart = "on-failure";
ExecStart = "${pkgs.connman}/sbin/connmand --nodaemon";
ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon";
StandardOutput = "null";
};
};