![Nikolay Amiantov](/assets/img/avatar_default.png)
This is a refactor of how resolvconf is managed on NixOS. We split it into a separate service which is enabled internally depending on whether we want /etc/resolv.conf to be managed by it. Various services now take advantage of those configuration options. We also now use systemd instead of activation scripts to update resolv.conf. NetworkManager now uses the right option for rc-manager DNS automatically, so the configuration option shouldn't be exposed.
86 lines
1.9 KiB
Nix
86 lines
1.9 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
let
|
|
|
|
useHostResolvConf = config.networking.resolvconf.enable && config.networking.useHostResolvConf;
|
|
|
|
bootStage2 = pkgs.substituteAll {
|
|
src = ./stage-2-init.sh;
|
|
shellDebug = "${pkgs.bashInteractive}/bin/bash";
|
|
shell = "${pkgs.bash}/bin/bash";
|
|
isExecutable = true;
|
|
inherit (config.nix) readOnlyStore;
|
|
inherit useHostResolvConf;
|
|
inherit (config.system.build) earlyMountScript;
|
|
path = lib.makeBinPath ([
|
|
pkgs.coreutils
|
|
pkgs.utillinux
|
|
] ++ lib.optional useHostResolvConf pkgs.openresolv);
|
|
fsPackagesPath = lib.makeBinPath config.system.fsPackages;
|
|
postBootCommands = pkgs.writeText "local-cmds"
|
|
''
|
|
${config.boot.postBootCommands}
|
|
${config.powerManagement.powerUpCommands}
|
|
'';
|
|
};
|
|
|
|
in
|
|
|
|
{
|
|
options = {
|
|
|
|
boot = {
|
|
|
|
postBootCommands = mkOption {
|
|
default = "";
|
|
example = "rm -f /var/log/messages";
|
|
type = types.lines;
|
|
description = ''
|
|
Shell commands to be executed just before systemd is started.
|
|
'';
|
|
};
|
|
|
|
devSize = mkOption {
|
|
default = "5%";
|
|
example = "32m";
|
|
type = types.str;
|
|
description = ''
|
|
Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
|
|
for the accepted syntax.
|
|
'';
|
|
};
|
|
|
|
devShmSize = mkOption {
|
|
default = "50%";
|
|
example = "256m";
|
|
type = types.str;
|
|
description = ''
|
|
Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
|
|
for the accepted syntax.
|
|
'';
|
|
};
|
|
|
|
runSize = mkOption {
|
|
default = "25%";
|
|
example = "256m";
|
|
type = types.str;
|
|
description = ''
|
|
Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
|
|
for the accepted syntax.
|
|
'';
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
config = {
|
|
|
|
system.build.bootStage2 = bootStage2;
|
|
|
|
};
|
|
}
|