diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-20 13:42:59 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-20 13:42:59 +0200 |
| commit | 22e086d8ea6ac2a4978eada0fa9ffb3a13a96ce3 (patch) | |
| tree | d1f89b786bf2834f13314e77e6f592299306f6bb /bbot | |
| parent | 3e527b9df0d9eb7a42b3fa05745224f00fcb9e19 (diff) | |
Add machine options
Diffstat (limited to 'bbot')
| -rw-r--r-- | bbot/agent.cxx | 8 | ||||
| -rw-r--r-- | bbot/machine-manifest | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/bbot/agent.cxx b/bbot/agent.cxx index b926908..4ade0b4 100644 --- a/bbot/agent.cxx +++ b/bbot/agent.cxx @@ -263,7 +263,13 @@ try rm.push_back ( bootstrapped_machine_manifest { - machine_manifest {mh.id, mh.name, mh.summary, machine_type::kvm}, + machine_manifest { + mh.id, + mh.name, + mh.summary, + machine_type::kvm, + string ("de:ad:be:ef:de:ad"), + nullopt}, toolchain_manifest {tc_id}, bootstrap_manifest {} }); diff --git a/bbot/machine-manifest b/bbot/machine-manifest index 3801ae7..9975a3b 100644 --- a/bbot/machine-manifest +++ b/bbot/machine-manifest @@ -34,16 +34,21 @@ namespace bbot { public: machine_type type; - optional<string> mac; // Required in bootstrapped machine manifest. + optional<string> mac; // Required in bootstrapped machine manifest. + optional<strings> options; machine_manifest (std::string i, std::string n, std::string s, - machine_type t) + machine_type t, + optional<string> m, + optional<strings> o) : machine_header_manifest (std::move (i), std::move (n), std::move (s)), - type (t) {} + type (t), + mac (std::move (m)), + options (std::move (o)) {} public: machine_manifest () = default; // VC export. |