ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-06-26 18:17:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make re-exec work with "dropbearmulti dropbear"

Browse Source 
The re-exec needs to know to use the dropbearmulti binary instead.
Add a test for this case.
This commit is contained in:
Matt Johnston
2022-02-01 22:18:23 +08:00
parent a95ca34a10
commit 3939321750
6 changed files with 94 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_dropbear.py
View File

@@ -19,7 +19,8 @@ def dropbear(request):
yield None
return
args = [opt.dropbear,
# split so that "dropbearmulti dropbear" works
args = opt.dropbear.split() + [
"-p", LOCALADDR, # bind locally only
"-r", opt.hostkey,
"-p", opt.port,
@@ -43,9 +44,10 @@ def dropbear(request):
def dbclient(request, *args, **kwargs):
opt = request.config.option
host = opt.remote or LOCALADDR
base_args = [opt.dbclient, "-y", host, "-p", opt.port]
# split so that "dropbearmulti dbclient" works
base_args = opt.dbclient.split() + ["-y", host, "-p", opt.port]
if opt.user:
full_args.extend(['-l', opt.user])
base_args.extend(['-l', opt.user])
full_args = base_args + list(args)
bg = kwargs.get("background")
if "background" in kwargs: