commit 8b89f1b1837cd99a15b6bea2ac17bb325422dee6
author Brandon Wyman <bjwyman@gmail.com> Thu Mar 12 15:19:56 2020 -0500
committer Brandon Wyman <bjwyman@gmail.com> Thu Mar 19 11:02:08 2020 -0500
tree f1da7ca5fed9d810a042c4c0ed904eec92ff2d4a
parent d0a26bb9adc1e233ddaec7a4dc759d8049457972

Updates to load JSON file from default location

The default (read-only) location for the JSON configuration file should
be /usr/share/phosphor-psu-monitor. Load from there if a file does not
exist in /etc/phosphor-psu-monitor.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: I704d24ecb55c948843eaea74b648d4b7b6c5a8a2

phosphor-power-supply/main.cpp

diff --git a/phosphor-power-supply/main.cpp b/phosphor-power-supply/main.cpp
index 03ff3db..542be4b 100644
--- a/phosphor-power-supply/main.cpp
+++ b/phosphor-power-supply/main.cpp
@@ -40,7 +40,15 @@
         CLI11_PARSE(app, argc, argv);
         if (configfile.empty())
         {
-            configfile = "/etc/phosphor-psu-monitor/psu_config.json";
+            if (std::filesystem::exists(
+                    "/etc/phosphor-psu-monitor/psu_config.json"))
+            {
+                configfile = "/etc/phosphor-psu-monitor/psu_config.json";
+            }
+            else
+            {
+                configfile = "/usr/share/phosphor-psu-monitor/psu_config.json";
+            }
         }
 
         if (!std::filesystem::exists(configfile))