From 7e97030a5c7bf846ebee1ee5212d2d0a9eb13bdb Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Wed, 25 Jul 2018 20:01:55 +0200 Subject: [PATCH] Fix scp & sftp on Kobo/Kindle (#4108) * Update dropbear path for the new, non-multicall binary * Bump base to pickup dropbear changes --- base | 2 +- plugins/SSH.koplugin/main.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base b/base index 84b7b51cf..7ab1e3b7c 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 84b7b51cff5ad43cab2b95b06f60e4e7b34a5a29 +Subproject commit 7ab1e3b7c8aa6187432b2b54d738a78b034781b1 diff --git a/plugins/SSH.koplugin/main.lua b/plugins/SSH.koplugin/main.lua index 7872fdf86..afc3837c1 100644 --- a/plugins/SSH.koplugin/main.lua +++ b/plugins/SSH.koplugin/main.lua @@ -14,7 +14,7 @@ local T = require("ffi/util").template -- reads the authorized_keys file from the relative path: settings/SSH/authorized_keys local path = DataStorage:getFullDataDir() -if not util.pathExists("dropbearmulti") then +if not util.pathExists("dropbear") then return { disabled = true, } end @@ -31,7 +31,7 @@ end function SSH:start() local cmd = string.format("%s %s %s %s%s %s", - "./dropbearmulti dropbear", + "./dropbear", "-E", "-R", "-p", self.SSH_port,