diff options
Diffstat (limited to 'bbot/agent/agent.cxx')
| -rw-r--r-- | bbot/agent/agent.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx index eec6072..67d503d 100644 --- a/bbot/agent/agent.cxx +++ b/bbot/agent/agent.cxx @@ -139,8 +139,6 @@ bootstrap_machine (const dir_path& md, else try { - string br ("br1"); // Using private bridge for now. - // Start the TFTP server (server chroot is --tftp). Map: // // GET requests to .../toolchains/<name>/* @@ -178,7 +176,7 @@ bootstrap_machine (const dir_path& md, start_machine (md, mm, obmm ? obmm->machine.mac : nullopt, - br, + ops.bridge (), tftpd.port ())); { @@ -813,8 +811,6 @@ try // const dir_path xp (snapshot_path (md)); - string br ("br1"); // Using private bridge for now. - for (size_t retry (0);; ++retry) { if (retry != 0) @@ -836,7 +832,7 @@ try start_machine (xp, mm.machine, mm.machine.mac, - br, + ops.bridge (), tftpd.port ())); // Note: the machine handling logic is similar to bootstrap. @@ -1108,6 +1104,11 @@ try dr << info << "bbot agent " << BBOT_VERSION_ID; + dr << + info << "cpu(s) " << ops.cpu () << + info << "ram(kB) " << ops.ram () << + info << "bridge " << ops.bridge (); + if (fingerprint) dr << info << "auth key fp " << *fingerprint; @@ -1116,9 +1117,7 @@ try info << "toolchain num " << tc_num << info << "toolchain ver " << tc_ver.string () << info << "toolchain id " << tc_id << - info << "instance num " << inst << - info << "CPU(s) " << ops.cpu () << - info << "RAM(kB) " << ops.ram (); + info << "instance num " << inst; for (const string& u: controllers) dr << info << "controller url " << u; |