commit 3d2cd669a610d0c2b182ad496ff571e48f72083b
author Vitaly Buka <vitalybuka@chromium.org> Tue Jun 16 16:23:03 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Jun 18 19:07:08 2015 +0000
tree 34c302b40881fd99049dd832353b16b578a4ea00
parent ae1ffbc8623320767bb2c4fffa609a46b24c11d2

buffet: Read privet options from buffet.conf

Privet code is part of buffet, so it does not need separate config.

BUG=brillo:1213
TEST=`FEATURES=test emerge-gizmo buffet`

Change-Id: I8b2ecb4143aa5d50555fcdc45c3708992187db4d
Reviewed-on: https://chromium-review.googlesource.com/277706
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>

buffet/main.cc

diff --git a/buffet/main.cc b/buffet/main.cc
index 3971abb..128d8e1 100644
--- a/buffet/main.cc
+++ b/buffet/main.cc
@@ -85,6 +85,7 @@
   options.state_path = base::FilePath{FLAGS_state_path};
   options.test_definitions_path = base::FilePath{FLAGS_test_definitions_path};
   options.xmpp_enabled = FLAGS_enable_xmpp;
+  options.privet.config_path = base::FilePath{FLAGS_config_path};
   options.privet.disable_privet = FLAGS_disable_privet;
   options.privet.disable_security = FLAGS_disable_security;
   options.privet.enable_ping = FLAGS_enable_ping;