Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shorewall: fix RestartTriggers #81774

Merged
merged 1 commit into from Mar 6, 2020

Conversation

ju1m
Copy link
Contributor

@ju1m ju1m commented Mar 4, 2020

Motivation for this change

My previous fix (now merged #80154) introduced a bug by removing apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); causing shorewall.service to be corrupted, because X-Restart-Triggers is now set to a garbage value (the content of the files instead of their paths).
The service was still starting but many warnings of wrong syntax were emitted in its logs.

Things done

Fix Restart-Triggers in shorewall and shorewall6 services by reverting apply and using .source instead of .text.
For config files, the more correct types.lines is also used instead of types.str.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants