From 596b8762c218d829f802a7f8d173948b9ca84c1d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 09:52:40 +0200
Subject: [PATCH] net/tayga: use NAME_setup

PR: https://github.com/opnsense/core/issues/5917
---
 .../service/conf/actions.d/actions_tayga.conf    | 16 ++++++----------
 .../service/templates/OPNsense/Tayga/tayga       |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/net/tayga/src/opnsense/service/conf/actions.d/actions_tayga.conf b/net/tayga/src/opnsense/service/conf/actions.d/actions_tayga.conf
index 9b114dff9..527e91857 100644
--- a/net/tayga/src/opnsense/service/conf/actions.d/actions_tayga.conf
+++ b/net/tayga/src/opnsense/service/conf/actions.d/actions_tayga.conf
@@ -1,22 +1,18 @@
+[start]
+command:/usr/local/etc/rc.d/opnsense-tayga start; /usr/local/etc/rc.routing_configure
+parameters:
+type:script_output
+message:starting tayga
+
 [stop]
 command:/usr/local/etc/rc.d/opnsense-tayga stop
 parameters:
 type:script_output
 message:stopping tayga
 
-[start]
-command:
-    /usr/local/opnsense/scripts/OPNsense/Tayga/setup.sh;
-    /usr/local/etc/rc.d/opnsense-tayga start;
-    /usr/local/etc/rc.routing_configure
-parameters:
-type:script_output
-message:starting tayga
-
 [restart]
 command:
     /usr/local/etc/rc.d/opnsense-tayga stop;
-    /usr/local/opnsense/scripts/OPNsense/Tayga/setup.sh;
     /usr/local/etc/rc.d/opnsense-tayga start;
     /usr/local/etc/rc.routing_configure
 parameters:
diff --git a/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga b/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga
index 93cae0d9e..0d740d98c 100644
--- a/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga
+++ b/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.tayga.general.enabled') and OPNsense.tayga.general.enabled == '1' %}
-tayga_var_script="/usr/local/opnsense/scripts/OPNsense/Tayga/setup.sh"
+tayga_script="/usr/local/opnsense/scripts/OPNsense/Tayga/setup.sh"
 tayga_enable="YES"
 tayga_v4address={{ OPNsense.tayga.general.v4address }}
 tayga_v4destination={{ OPNsense.tayga.general.v4destination }}