From 30ca5a07498693d820b3728951a184e02cfa61f9 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Sat, 4 Sep 2021 13:23:55 +0700
Subject: T3697: do not try to restart charon if it's not required

The root cause is that the ipsec-settings.py script is run _twice_:
first from "vpn ipsec options", then from the top level "vpn" node.

The case when it's not required is when:
* "vpn ipsec" configuration doesn't exist yet
* user configured it with "vpn ipsec options"
* the ipsec-settings.py script is run first time, from "vpn ipsec options"

Trying to restart charon at that stage leads to a deadlock.
---
 interface-definitions/ipsec-settings.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions/ipsec-settings.xml.in')

diff --git a/interface-definitions/ipsec-settings.xml.in b/interface-definitions/ipsec-settings.xml.in
index bc54baa27..dbf6625fb 100644
--- a/interface-definitions/ipsec-settings.xml.in
+++ b/interface-definitions/ipsec-settings.xml.in
@@ -4,7 +4,7 @@
     <children>
       <node name="ipsec">
         <children>
-          <node name="options" owner="${vyos_conf_scripts_dir}/ipsec-settings.py">
+          <node name="options" owner="${vyos_conf_scripts_dir}/ipsec-settings.py from-options">
             <properties>
               <help>Global IPsec settings</help>
             </properties>
-- 
cgit v1.2.3