From: Sergey Ponomarev <stokito@gmail.com>
Date: Sat, 3 Jun 2023 10:23:35 +0000 (+0300)
Subject: sshtunnel: Use -i $IdentityFile instead of -o IdentityFile=$IdentityFile
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=f14dae7bc9ef0db6f6b25e605dc6c963d9417e17;p=feed%2Fpackages.git

sshtunnel: Use -i $IdentityFile instead of -o IdentityFile=$IdentityFile

This makes the sshtunnel compatible with Dropbear.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
---

diff --git a/net/sshtunnel/files/sshtunnel.init b/net/sshtunnel/files/sshtunnel.init
index 4a23c9fbe7..480933edee 100644
--- a/net/sshtunnel/files/sshtunnel.init
+++ b/net/sshtunnel/files/sshtunnel.init
@@ -174,10 +174,12 @@ load_server() {
 	config_foreach validate_tunnelW_section "tunnelW" load_tunnelW
 	[ "$count" -eq 0 ] && { _err "tunnels to $server not started - no tunnels defined"; return 1; }
 
-	append_params CheckHostIP Compression CompressionLevel IdentityFile \
+	append_params CheckHostIP Compression CompressionLevel \
 		LogLevel PKCS11Provider ServerAliveCountMax ServerAliveInterval \
 		StrictHostKeyChecking TCPKeepAlive VerifyHostKeyDNS
 
+	# dropbear doesn't support -o IdentityFile so use -i instead
+	[ -n "$IdentityFile" ] && ARGS_options="$ARGS_options -i $IdentityFile"
 	ARGS="$ARGS_options -o ExitOnForwardFailure=yes -o BatchMode=yes -nN $ARGS_tunnels -p $port $user@$hostname"
 
 	procd_open_instance "$server"