BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixos/resolvconf: add package

Browse source 
Expose the package that provides the system-wide `resolvconf` command
(either openresolv or systemd) to allow implementation-agnostic modules.
This commit is contained in:
Naïm Favier 2022-03-29 21:14:13 +02:00
parent 0d68d7c857
commit 203696f098
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
nixos/modules/config/resolvconf.nix
View file

@ -50,7 +50,20 @@ in
default = !(config.environment.etc ? "resolv.conf"); default = !(config.environment.etc ? "resolv.conf");
defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")''; defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")'';
description = '' description = ''
DNS configuration is managed by resolvconf. Whether DNS configuration is managed by resolvconf.
'';
};
package = mkOption {
type = types.package;
default = pkgs.openresolv;
defaultText = literalExpression "pkgs.openresolv";
description = ''
The package that provides the system-wide resolvconf command. Defaults to <literal>openresolv</literal>
if this module is enabled. Otherwise, can be used by other modules (for example <option>services.resolved</option>) to
provide a compatibility layer.
This option generally shouldn't be set by the user.
''; '';
}; };
@ -119,10 +132,12 @@ in
exit 1 exit 1
'' ''
else configText; else configText;
environment.systemPackages = [ cfg.package ];
} }
(mkIf cfg.enable { (mkIf cfg.enable {
environment.systemPackages = [ pkgs.openresolv ]; networking.resolvconf.package = pkgs.openresolv;
systemd.services.resolvconf = { systemd.services.resolvconf = {
description = "resolvconf update"; description = "resolvconf update";
@ -134,7 +149,7 @@ in
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.openresolv}/bin/resolvconf -u"; ExecStart = "${cfg.package}/bin/resolvconf -u";
RemainAfterExit = true; RemainAfterExit = true;
}; };
}; };

4
nixos/modules/system/boot/resolved.nix
View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
@ -178,6 +178,8 @@ in
# If networkmanager is enabled, ask it to interface with resolved. # If networkmanager is enabled, ask it to interface with resolved.
networking.networkmanager.dns = "systemd-resolved"; networking.networkmanager.dns = "systemd-resolved";
networking.resolvconf.package = pkgs.systemd;
}; };
} }