aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bbot/agent/agent.cxx8
-rw-r--r--bbot/agent/tftp.cxx18
2 files changed, 13 insertions, 13 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index 1ef6d16..eacd05a 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -126,11 +126,11 @@ bootstrap_machine (const dir_path& md,
// PUT requests to .../bootstrap/<name>/*
//
auto_rmdir arm ((dir_path (ops.tftp ()) /= "bootstrap") /= tc_name);
- try_mkdir_p (arm.path ());
+ try_mkdir_p (arm.path);
// Bootstrap result manifest.
//
- path mf (arm.path () / "manifest");
+ path mf (arm.path / "manifest");
try_rmfile (mf);
// Note that unlike build, here we use the same VM snapshot for retries,
@@ -600,8 +600,8 @@ try
//
auto_rmdir arm ((dir_path (ops.tftp ()) /= "build") /= tc_name);
- dir_path gd (dir_path (arm.path ()) /= "get");
- dir_path pd (dir_path (arm.path ()) /= "put");
+ dir_path gd (dir_path (arm.path) /= "get");
+ dir_path pd (dir_path (arm.path) /= "put");
try_mkdir_p (gd);
try_mkdir_p (pd);
diff --git a/bbot/agent/tftp.cxx b/bbot/agent/tftp.cxx
index 27c1577..05ca157 100644
--- a/bbot/agent/tftp.cxx
+++ b/bbot/agent/tftp.cxx
@@ -46,7 +46,7 @@ namespace bbot
// Create the map file.
//
map_ = auto_rmfile (path::temp_path ("bbot-agent-tftp-map"));
- ofdstream ofs (map_.path ());
+ ofdstream ofs (map_.path);
ofs << map << endl;
ofs.close ();
}
@@ -115,14 +115,14 @@ namespace bbot
fddup (fd),
fddup (fd),
2,
- "sudo", // Required for --secure (chroot).
- "/usr/sbin/in.tftpd", // Standard installation location.
- "--timeout", 1, // Wait for more requests.
- "--permissive", // Use inherited umask.
- "--create", // Allow creating new files (PUT).
- "--map-file", map_.path (), // Path remapping rules.
- "--user", uname, // Run as our effective user.
- "--secure", // Chroot to data directory.
+ "sudo", // Required for --secure (chroot).
+ "/usr/sbin/in.tftpd", // Standard installation location.
+ "--timeout", 1, // Wait for more requests.
+ "--permissive", // Use inherited umask.
+ "--create", // Allow creating new files (PUT).
+ "--map-file", map_.path, // Path remapping rules.
+ "--user", uname, // Run as our effective user.
+ "--secure", // Chroot to data directory.
ops.tftp ());
// This is not really accurate since tftpd will, for example, serve