diff options
| author | Daniil Baturin <daniil@baturin.org> | 2021-09-04 13:23:55 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2021-09-04 23:29:21 +0700 |
| commit | 30ca5a07498693d820b3728951a184e02cfa61f9 (patch) | |
| tree | 095ec37731707f8a70e8cc89182e26f118d0238c /interface-definitions | |
| parent | 027b48f1c87c1992e360a5c933df859a4067c4b4 (diff) | |
| download | vyos-1x-30ca5a07498693d820b3728951a184e02cfa61f9.tar.gz vyos-1x-30ca5a07498693d820b3728951a184e02cfa61f9.zip | |
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.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/ipsec-settings.xml.in | 2 |
1 files changed, 1 insertions, 1 deletions
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> |