commit 1d66fe6ee6805d682e0b6be4b177b58b8acbade2
author Patrick Venture <venture@google.com> Mon Jun 03 14:57:27 2019 -0700
committer Patrick Venture <venture@google.com> Tue Jun 04 18:15:15 2019 +0000
tree 04659eb1428f883a8278271d6b06fb04cebfdf7a
parent fdeb864820b17a7b6d4e26c64f9fcad74fa2415f

merge Verification and Update Interfaces

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

update_systemd.hpp

diff --git a/update_systemd.hpp b/update_systemd.hpp
index 693beb4..15d616f 100644
--- a/update_systemd.hpp
+++ b/update_systemd.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "update.hpp"
+#include "status.hpp"
 
 #include <memory>
 #include <sdbusplus/bus.hpp>
@@ -12,10 +12,10 @@
 /**
  * Implements the update interface by simply triggering a systemd unit.
  */
-class SystemdUpdateMechanism : public UpdateInterface
+class SystemdUpdateMechanism : public TriggerableActionInterface
 {
   public:
-    static std::unique_ptr<UpdateInterface>
+    static std::unique_ptr<TriggerableActionInterface>
         CreateSystemdUpdate(sdbusplus::bus::bus&& bus,
                             const std::string& target,
                             const std::string& mode = "");
@@ -33,8 +33,8 @@
     SystemdUpdateMechanism(SystemdUpdateMechanism&&) = default;
     SystemdUpdateMechanism& operator=(SystemdUpdateMechanism&&) = default;
 
-    bool triggerUpdate() override;
-    void abortUpdate() override;
+    bool trigger() override;
+    void abort() override;
     ActionStatus status() override;
 
   private: