commit e0fdeee852881177b5e5b81868969e31e2bbe88e
author Christopher Wiley <wiley@chromium.org> Sat Feb 07 18:29:32 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Feb 10 23:07:09 2015 +0000
tree 7069f630dfb08514a864e745d51c5b800d511fcc
parent 586b8b5d68906b576eca246168663ef5d897c227

buffet: Read config/state paths from commandline

This allows us to use custom paths and configurations in test without
altering normal system operation.

BUG=brillo:172
TEST=unittests

Change-Id: I1a969093683205d5f600ff88ebba8b22c05368b4
Reviewed-on: https://chromium-review.googlesource.com/247504
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

buffet/etc/init/buffet.conf

diff --git a/buffet/etc/init/buffet.conf b/buffet/etc/init/buffet.conf
index 0d7697e..0747ef5 100644
--- a/buffet/etc/init/buffet.conf
+++ b/buffet/etc/init/buffet.conf
@@ -9,6 +9,10 @@
 stop on stopping system-services
 respawn
 
+env BUFFET_LOG_LEVEL=0
+env BUFFET_STATE_PATH=
+env BUFFET_CONFIG_PATH=
+
 pre-start script
   mkdir -m 0755 -p /var/lib/buffet
   chown -R buffet:buffet /var/lib/buffet
@@ -17,5 +21,7 @@
 # Minijail actually forks off our desired process.
 expect fork
 
-exec minijail0 -i -g buffet -u buffet \
-	/usr/bin/buffet --v="${V:-1}"
+exec minijail0 -i -g buffet -u buffet /usr/bin/buffet \
+    --v="${BUFFET_LOG_LEVEL}" \
+    --config_path="${BUFFET_CONFIG_PATH}" \
+    --state_path="${BUFFET_STATE_PATH}"