From 327f006aeadeb0d54c843962d08b41dd8d3241fe Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 09:50:57 +0200
Subject: [PATCH] net/vnstat: use NAME_setup

PR: https://github.com/opnsense/core/issues/5917
---
 .../opnsense/service/conf/actions.d/actions_vnstat.conf   | 8 ++++----
 .../src/opnsense/service/templates/OPNsense/Vnstat/vnstat | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf b/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf
index 0e13bb1b3..4a4fcbd64 100644
--- a/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf
+++ b/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf
@@ -1,23 +1,23 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh;/usr/local/etc/rc.d/vnstat start && sleep 1
+command:/usr/local/etc/rc.d/vnstat start && sleep 1
 parameters:
 type:script
 message:starting Vnstat
 
 [stop]
-command:/usr/local/etc/rc.d/vnstat stop; exit 0
+command:/usr/local/etc/rc.d/vnstat stop
 parameters:
 type:script
 message:stopping Vnstat
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh;/usr/local/etc/rc.d/vnstat restart && sleep 1
+command:/usr/local/etc/rc.d/vnstat restart && sleep 1
 parameters:
 type:script
 message:restarting Vnstat
 
 [status]
-command:/usr/local/etc/rc.d/vnstat status;exit 0
+command:/usr/local/etc/rc.d/vnstat status; exit 0
 parameters:
 type:script_output
 message:request Vnstat status
diff --git a/net/vnstat/src/opnsense/service/templates/OPNsense/Vnstat/vnstat b/net/vnstat/src/opnsense/service/templates/OPNsense/Vnstat/vnstat
index c04a95f78..345177c8a 100644
--- a/net/vnstat/src/opnsense/service/templates/OPNsense/Vnstat/vnstat
+++ b/net/vnstat/src/opnsense/service/templates/OPNsense/Vnstat/vnstat
@@ -1,6 +1,6 @@
 {% if helpers.exists('OPNsense.vnstat.general.enabled') and OPNsense.vnstat.general.enabled == '1' %}
 {% from 'OPNsense/Macros/interface.macro' import physical_interface %}
-vnstat_var_script="/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh"
+vnstat_setup="/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh"
 vnstat_enable="YES"
 {%   if helpers.exists('OPNsense.vnstat.general.interface') and OPNsense.vnstat.general.interface != '' %}
 {%     set interfaces = [] %}