From 3755577ba63f92d424ddccca41660e36752e8995 Mon Sep 17 00:00:00 2001 From: Sharif Olorin Date: Sun, 10 Feb 2019 00:11:31 +0000 Subject: [PATCH] nixos/systemd: update max line length in systemd units The length check was introduced[0] to match systemd's max line length. This limit has been increased[1][2] to 1MiB, starting with systemd v235. [0] https://github.com/nixos/nixpkgs/issues/3403 [1] https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af (relevant systemd commit) [2] https://github.com/systemd/systemd/issues/3302 (more context on systemd change) --- nixos/modules/system/boot/systemd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index f783daba902a..58812bf33d9b 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -321,7 +321,9 @@ let in concatMapStrings (n: let s = optionalString (env."${n}" != null) "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; - in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} + # 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)} ${if def.reloadIfChanged then '' X-ReloadIfChanged=true '' else if !def.restartIfChanged then ''