systemd-initrd, systemd-lib: drop initrdServiceToUnit
We can just use serviceToUnit here.
This commit is contained in:
parent
74bae06748
commit
e3083decc4
|
@ -391,22 +391,6 @@ in rec {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
initrdServiceToUnit = name: def:
|
|
||||||
{ inherit (def) aliases wantedBy requiredBy enable;
|
|
||||||
text = commonUnitText def +
|
|
||||||
''
|
|
||||||
[Service]
|
|
||||||
${let env = def.environment;
|
|
||||||
in concatMapStrings (n:
|
|
||||||
let s = optionalString (env.${n} != null)
|
|
||||||
"Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
|
|
||||||
# systemd max line length is now 1MiB
|
|
||||||
# https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af
|
|
||||||
in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
|
|
||||||
${attrsToSection def.serviceConfig}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
socketToUnit = name: def:
|
socketToUnit = name: def:
|
||||||
{ inherit (def) aliases wantedBy requiredBy enable;
|
{ inherit (def) aliases wantedBy requiredBy enable;
|
||||||
text = commonUnitText def +
|
text = commonUnitText def +
|
||||||
|
|
|
@ -7,7 +7,7 @@ let
|
||||||
inherit (systemdUtils.lib)
|
inherit (systemdUtils.lib)
|
||||||
generateUnits
|
generateUnits
|
||||||
pathToUnit
|
pathToUnit
|
||||||
initrdServiceToUnit
|
serviceToUnit
|
||||||
sliceToUnit
|
sliceToUnit
|
||||||
socketToUnit
|
socketToUnit
|
||||||
targetToUnit
|
targetToUnit
|
||||||
|
@ -344,12 +344,12 @@ in {
|
||||||
|
|
||||||
targets.initrd.aliases = ["default.target"];
|
targets.initrd.aliases = ["default.target"];
|
||||||
units =
|
units =
|
||||||
mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths
|
mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths
|
||||||
// mapAttrs' (n: v: nameValuePair "${n}.service" (initrdServiceToUnit n v)) cfg.services
|
// mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
|
||||||
// mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices
|
// mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices
|
||||||
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
|
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
|
||||||
// mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
|
// mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
|
||||||
// mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
|
// mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
|
||||||
// listToAttrs (map
|
// listToAttrs (map
|
||||||
(v: let n = escapeSystemdPath v.where;
|
(v: let n = escapeSystemdPath v.where;
|
||||||
in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts)
|
in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user