From: Stijn Tintel <redacted>
Date: Tue, 1 Aug 2017 01:29:45 +0000 (+0200)
Subject: strongswan: check return value instead of output
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b93a53bd94f4255f39bd204197d96b98442b9c56;p=openwrt-packages.git

strongswan: check return value instead of output

When the strongswan service is running, `ipsec status` returns 0. Check
the return value instead of checking its output.

While at it, remove the [[ ]] bashism, use rereadall instead of
(reread)secrets, and move it inside the if statement.

Signed-off-by: Stijn Tintel <redacted>
---

diff --git a/net/strongswan/files/ipsec.init b/net/strongswan/files/ipsec.init
index af838a823..0bbec766c 100644
--- a/net/strongswan/files/ipsec.init
+++ b/net/strongswan/files/ipsec.init
@@ -331,8 +331,8 @@ restart() {
 
 reload() {
 	prepare_env
-	ipsec secrets
-	if [[ ! -z "$(ipsec status)" ]]; then
+	if ipsec status > /dev/null 2>&1; then
+		ipsec rereadall
 		ipsec reload
 	else
 		ipsec start