forked from DGNum/liminix
default value for services.default
as a default default target, start all the services
This commit is contained in:
parent
23ccfec5fb
commit
e86daf9bbc
2 changed files with 14 additions and 24 deletions
|
@ -201,27 +201,6 @@ in rec {
|
|||
dependencies = [ services.dhcp6 ];
|
||||
};
|
||||
|
||||
services.default = target {
|
||||
name = "default";
|
||||
contents = with config.services; [
|
||||
config.hardware.networkInterfaces.lo
|
||||
int
|
||||
bridge
|
||||
hostap
|
||||
hostap5
|
||||
ntp
|
||||
defaultroute4
|
||||
defaultroute6
|
||||
packet_forwarding
|
||||
dns
|
||||
resolvconf
|
||||
sshd
|
||||
config.services.hostname
|
||||
dhcp6
|
||||
acquire-lan-prefix
|
||||
acquire-wan-address
|
||||
];
|
||||
};
|
||||
defaultProfile.packages = with pkgs; [
|
||||
min-collect-garbage
|
||||
];
|
||||
|
|
|
@ -7,10 +7,21 @@ let
|
|||
s6-linux-init
|
||||
stdenvNoCC;
|
||||
inherit (pkgs.pseudofile) dir symlink;
|
||||
inherit (pkgs.liminix.services) bundle;
|
||||
|
||||
s6-rc-db = pkgs.s6-rc-database.override {
|
||||
services = builtins.attrValues config.services;
|
||||
};
|
||||
s6-rc-db =
|
||||
let
|
||||
defaultDefaultTarget = bundle {
|
||||
name = "default";
|
||||
contents = builtins.attrValues config.services;
|
||||
};
|
||||
servicesAttrs = {
|
||||
default = defaultDefaultTarget;
|
||||
} // config.services;
|
||||
in
|
||||
pkgs.s6-rc-database.override {
|
||||
services = builtins.attrValues servicesAttrs;
|
||||
};
|
||||
s6-init-scripts = stdenvNoCC.mkDerivation {
|
||||
name = "s6-scripts";
|
||||
src = ./scripts;
|
||||
|
|
Loading…
Reference in a new issue