diff options
| -rw-r--r-- | bbot/agent.cxx | 4 | ||||
| -rw-r--r-- | tests/machine/testscript | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bbot/agent.cxx b/bbot/agent.cxx index 432e53a..683bd73 100644 --- a/bbot/agent.cxx +++ b/bbot/agent.cxx @@ -110,7 +110,7 @@ bootstrap_machine (const dir_path& md, // Start the TFTP server (server chroot is --tftp). Map: // - // GET requests to .../toolchain/<name>/* + // GET requests to .../toolchains/<name>/* // PUT requests to .../bootstrap/<name>/* // auto_rmdir arm ((dir_path (ops.tftp ()) /= "bootstrap") /= tc_name); @@ -121,7 +121,7 @@ bootstrap_machine (const dir_path& md, path mf (arm.path () / "manifest"); try_rmfile (mf); - tftp_server tftpd ("Gr ^/?(.+)$ /toolchain/" + tc_name + "/\\1\n" + + tftp_server tftpd ("Gr ^/?(.+)$ /toolchains/" + tc_name + "/\\1\n" + "Pr ^/?(.+)$ /bootstrap/" + tc_name + "/\\1\n"); l3 ([&]{trace << "tftp server on port " << tftpd.port ();}); diff --git a/tests/machine/testscript b/tests/machine/testscript index 93791e9..dfd1312 100644 --- a/tests/machine/testscript +++ b/tests/machine/testscript @@ -25,7 +25,7 @@ rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30 # # Note: similar logic to what we have in Build OS. # -+mkdir -p $tftp/toolchain/default/ ++mkdir -p $tftp/toolchains/default/ +curl -s -S -f -L $toolchain_url/toolchain.sha256 >=toolchain.sha256 +sed -n -e 's%^[0-9a-f]+ \*(.+)$%\1%p' toolchain.sha256 | set -e archives @@ -34,19 +34,19 @@ rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30 +/bin/bash -c "while read i && test -n \"\$i\"; do \ b=`basename \$i` ; \ -f=$tftp/toolchain/default/\$b; \ +f=$tftp/toolchains/default/\$b; \ echo \$b: 1>&2; \ curl -# -f -L -z \$f -o \$f $toolchain_url/\$i; \ ln -sf \$b `sed -n -re 's/^\(.+\)-$version\(.+\)/\\1\\2/p' <<<\$f`; \ done" <"$archives" 2>| -+echo "$version" >=$tftp/toolchain/default/version -+echo "$toolchain_trust" >=$tftp/toolchain/default/trust ++echo "$version" >=$tftp/toolchains/default/version ++echo "$toolchain_trust" >=$tftp/toolchains/default/trust #\ # # To test the bootstrap script locally, start the TFTP server in -# $tftp/toolchain/default/. +# $tftp/toolchains/default/. # sudo /usr/sbin/in.tftpd \ |