From: Stijn Tintel Date: Fri, 7 Jan 2022 08:45:50 +0000 (+0200) Subject: ruleset.uc: don't trim newline before comment sign X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=21f311d93a68b4c095c0162b4be20ce4b4c2540b;p=project%2Ffirewall4.git ruleset.uc: don't trim newline before comment sign When flow offloading is enabled, the comment block is inserted in the ruleset like this: table inet fw4 { # # Flowtable # This is due to the trimming of newlines which was done to avoid having to modify all the test files. A better solution is to just add an extra newline in the template. Signed-off-by: Stijn Tintel Reviewed-by: Jo-Philipp Wich --- diff --git a/root/usr/share/firewall4/templates/ruleset.uc b/root/usr/share/firewall4/templates/ruleset.uc index bb79205..56d18ec 100644 --- a/root/usr/share/firewall4/templates/ruleset.uc +++ b/root/usr/share/firewall4/templates/ruleset.uc @@ -2,7 +2,7 @@ table inet fw4 flush table inet fw4 table inet fw4 { -{%- if (fw4.default_option("flow_offloading") && length(devices) > 0): %} +{% if (fw4.default_option("flow_offloading") && length(devices) > 0): %} # # Flowtable # @@ -16,7 +16,6 @@ table inet fw4 { } {% endif %} - # # Set definitions #