commit ec105dda9ce4e764f28cfa91a34e2d9fa9730eaf
author Patrick Venture <venture@google.com> Mon Aug 05 09:35:26 2019 -0700
committer Patrick Venture <venture@google.com> Mon Aug 05 09:37:38 2019 -0700
tree c3abbf781297537952723db5fda0976534bb1cac
parent cf0e5de3f838898861208f8e2743aaf5221a5d5e

bugfix: bmc: update service requires mode

Systemd startunit requires a job-mode.  Default it to "replace."  In a
later patchset, the update systemd and verify system will collapse into
one object, but this fix applies to the current implementation.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ia6465abac9979501ea7149933394d8c452b2f315

bmc/buildjson.cpp

diff --git a/bmc/buildjson.cpp b/bmc/buildjson.cpp
index a359add..aec9a09 100644
--- a/bmc/buildjson.cpp
+++ b/bmc/buildjson.cpp
@@ -113,7 +113,7 @@
             {
                 const auto& unit = update.at("unit");
                 pack->update = SystemdUpdateMechanism::CreateSystemdUpdate(
-                    sdbusplus::bus::new_default(), unit);
+                    sdbusplus::bus::new_default(), unit, "replace");
             }
             else
             {

bmc/update_systemd.cpp

diff --git a/bmc/update_systemd.cpp b/bmc/update_systemd.cpp
index d8f2329..92c97c8 100644
--- a/bmc/update_systemd.cpp
+++ b/bmc/update_systemd.cpp
@@ -45,11 +45,7 @@
     auto method = bus.new_method_call(systemdService, systemdRoot,
                                       systemdInterface, "StartUnit");
     method.append(target);
-
-    if (!mode.empty())
-    {
-        method.append(mode);
-    }
+    method.append(mode);
 
     try
     {

bmc/update_systemd.hpp

diff --git a/bmc/update_systemd.hpp b/bmc/update_systemd.hpp
index 15d616f..fe0ab33 100644
--- a/bmc/update_systemd.hpp
+++ b/bmc/update_systemd.hpp
@@ -17,8 +17,7 @@
   public:
     static std::unique_ptr<TriggerableActionInterface>
         CreateSystemdUpdate(sdbusplus::bus::bus&& bus,
-                            const std::string& target,
-                            const std::string& mode = "");
+                            const std::string& target, const std::string& mode);
 
     SystemdUpdateMechanism(sdbusplus::bus::bus&& bus, const std::string& target,
                            const std::string& mode) :