From 8e7ca7c5ff18e17cab7b6b3ae569565224f95fcc Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 17 Dec 2015 16:06:33 +0100 Subject: remove master and naming overhaul Remove master process entirely, it is not useful in its current form. We first need to understand what we want from it, and them re-implement it. Prefix all binaries with syz- to avoid name clashes. --- vm/qemu/qemu.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vm') diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index d00e2c050..bb560accb 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -258,8 +258,8 @@ func (inst *Instance) Run() { inst.Logf("started vm") // Copy the binaries into the instance. - if !inst.CreateSCPCommand(inst.Fuzzer, "/syzkaller_fuzzer").Wait(1*time.Minute) || - !inst.CreateSCPCommand(inst.Executor, "/syzkaller_executor").Wait(1*time.Minute) { + if !inst.CreateSCPCommand(inst.Fuzzer, "/syz-fuzzer").Wait(1*time.Minute) || + !inst.CreateSCPCommand(inst.Executor, "/syz-executor").Wait(1*time.Minute) { outputMu.Lock() output = append(output, "\nfailed to scp binaries into the instance\n"...) inst.SaveCrasher(output) @@ -280,7 +280,7 @@ func (inst *Instance) Run() { if inst.cfg.NoDropPrivs { dropprivs = "-dropprivs=0" } - cmd := inst.CreateSSHCommand(fmt.Sprintf("/syzkaller_fuzzer -name %v -executor /syzkaller_executor -manager %v:%v -procs %v -leak=%v %v %v %v", + cmd := inst.CreateSSHCommand(fmt.Sprintf("/syz-fuzzer -name %v -executor /syz-executor -manager %v:%v -procs %v -leak=%v %v %v %v", inst.name, hostAddr, inst.cfg.ManagerPort, inst.cfg.Procs, inst.cfg.Leak, cover, dropprivs, inst.callsFlag)) deadline := start.Add(time.Hour) -- cgit mrf-deployment