diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 91dbc4f4647c3..e251e6481db8a 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -176,6 +176,8 @@ - `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead. +- `services.opensnitch.settings.Ebpf` option has been removed. It was previously unused and did not affect anything. + - To avoid delaying user logins unnecessarily the `multi-user.target` is no longer ordered after `network-online.target`. System services requiring a connection to start correctly must explicitly state so, i.e. ```nix diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 10b44052ac6eb..4ac1b0e1aa3de 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -59,6 +59,10 @@ in type = types.submodule { freeformType = format.type; + imports = [ + (mkRemovedOptionModule [ "Ebpf" ] "this option was unused") + ]; + options = { Server = { @@ -152,24 +156,6 @@ in }; - Ebpf.ModulesPath = mkOption { - type = types.path; - default = - if cfg.settings.ProcMonitorMethod == "ebpf" then - "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd" - else - null; - defaultText = literalExpression '' - if cfg.settings.ProcMonitorMethod == "ebpf" then - "\\$\\{config.boot.kernelPackages.opensnitch-ebpf\\}/etc/opensnitchd" - else null; - ''; - description = '' - Configure eBPF modules path. Used when - `settings.ProcMonitorMethod` is set to `ebpf`. - ''; - }; - Rules.Path = mkOption { type = types.path; default = "/var/lib/opensnitch/rules";