Skip to content

Add "scpfrom src dst" action to freebsd-vm-boot task #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add "scpfrom src dst" action to freebsd-vm-boot task #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion bricoler
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ function Task:run(ctx)
if not action then
errx("Task '%s' has no action '%s'", self.name, ctx.action)
end
action(params)
action(params, ctx)
else
print(prefix .. " running")
self.starttime = os.time()
Expand Down Expand Up @@ -2526,6 +2526,31 @@ Task{
"-p", port,
"root@" .. addr)
end,

-- SCP from the VM.
scpfrom = function(self, ctx)
assert(ctx)
assert(ctx.action_arg1)
assert(ctx.action_arg2)

local f = io.open_checked("./ssh-addr", "r")
local sshaddr = f:read("*l")
f:close()

local addr, port = sshaddr:match("^(.*):(%d+)$")
local user = "root"
local key = pwd() .. "/ssh-keys" .. "/id_ed25519_root"
local src = ctx.action_arg1
local dst = ctx.action_arg2
exec("scp",
"-i", key,
"-P", port,
"-o", "StrictHostKeyChecking=no",
"-o", "UserKnownHostsFile=/dev/null",
user .. "@" .. addr .. ":" .. src,
dst
)
end,
}
}

Expand Down Expand Up @@ -2847,6 +2872,12 @@ cmds.run:argument("task")
cmds.run:argument("action")
:args("0-1")
:description("Optional auxilliary action name")
cmds.run:argument("action_arg1")
:args("?")
:description("Optional auxilliary action's argument 1")
cmds.run:argument("action_arg2")
:args("?")
:description("Optional auxilliary action's argument 2")
cmds.run:option("--workdir")
:description("Working directory")
:default(workdir_default())
Expand Down Expand Up @@ -2909,6 +2940,8 @@ elseif args.run then
local ts = TaskSchedule{
ctx = {
action = args.action,
action_arg1 = args.action_arg1,
action_arg2 = args.action_arg2,
maxjobs = tonumber(args.maxjobs),
workdir = args.workdir,
},
Expand Down