diff options
author | Alexander Foremny <aforemny@posteo.de> | 2021-03-19 09:03:49 +0100 |
---|---|---|
committer | Alexander Foremny <aforemny@posteo.de> | 2021-03-19 09:05:33 +0100 |
commit | 297b1ba320ae8467bf273f5831e5ec358685057c (patch) | |
tree | f939ca9e2fd70fd6d1ab7ccb90e98837392a2816 /nixos | |
parent | 1bb03d47cd31fcf88e727878e33569c9b4ab335f (diff) |
Revert "nixos/systemd: Handle template overrides"
This reverts commit e3b90b6ccc4cf4147fd01df1ed8779b1c85744bd. This commit broke container tests and thus blocked channels from advancing.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/system/boot/systemd-lib.nix | 13 | ||||
-rw-r--r-- | nixos/tests/systemd-template-override.nix | 41 |
2 files changed, 1 insertions, 53 deletions
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 6051a42857494..2dbf15031a088 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -182,18 +182,7 @@ in rec { # upstream unit. for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do fn=$(basename $i/*) - - case $fn in - # if file name is a template specialization, use the template's name - *@?*.service) - # remove @foo.service and replace it with @.service - ofn="''${fn%@*.service}@.service" - ;; - *) - ofn="$fn" - esac - - if [ -e $out/$ofn ]; then + if [ -e $out/$fn ]; then if [ "$(readlink -f $i/$fn)" = /dev/null ]; then ln -sfn /dev/null $out/$fn else diff --git a/nixos/tests/systemd-template-override.nix b/nixos/tests/systemd-template-override.nix deleted file mode 100644 index d8ef4a6c1c9bd..0000000000000 --- a/nixos/tests/systemd-template-override.nix +++ /dev/null @@ -1,41 +0,0 @@ -import ./make-test-python.nix { - name = "systemd-template-override"; - - machine = { pkgs, lib, ... }: let - touchTmp = pkgs.writeTextFile { - name = "touch-tmp@.service"; - text = '' - [Service] - Type=oneshot - ExecStart=${pkgs.coreutils}/bin/touch /tmp/%I - ''; - destination = "/etc/systemd/system/touch-tmp@.service"; - }; - in { - systemd.packages = [ touchTmp ]; - - systemd.services."touch-tmp@forbidden" = { - serviceConfig.ExecStart = [ "" '' - ${pkgs.coreutils}/bin/true - '']; - }; - - systemd.services."touch-tmp@intercept" = { - serviceConfig.ExecStart = [ "" '' - ${pkgs.coreutils}/bin/touch /tmp/renamed - '']; - }; - }; - - testScript = '' - machine.wait_for_unit("default.target") - - machine.succeed("systemctl start touch-tmp@normal") - machine.succeed("systemctl start touch-tmp@forbbidden") - machine.succeed("systemctl start touch-tmp@intercept") - - machine.succeed("[ -e /tmp/normal ]") - machine.succeed("[ ! -e /tmp/forbidden ]") - machine.succeed("[ -e /tmp/renamed ]") - ''; -} |