core: get rid of condition.c and move the remaining call into util.c

[elogind.git] / src / core / unit.h

diff --git a/src/core/unit.h b/src/core/unit.h
index 081ab18f10289fd2b74dc2e9dc97e8ed959ddfcb..b5a224b3d4d737740c8242e0d4ee67462c205329 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -38,7 +38,7 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 #include "socket-util.h"
 #include "execute.h"
 #include "cgroup.h"
 #include "socket-util.h"
 #include "execute.h"
 #include "cgroup.h"

-#include "condition.h"
+#include "condition-util.h"

 #include "install.h"
 #include "unit-name.h"
 #include "failure-action.h"
 #include "install.h"
 #include "unit-name.h"
 #include "failure-action.h"


@@ -129,8 +129,10 @@ struct Unit {
 
         /* Conditions to check */
         LIST_HEAD(Condition, conditions);
 
         /* Conditions to check */
         LIST_HEAD(Condition, conditions);

+        LIST_HEAD(Condition, asserts);

 
         dual_timestamp condition_timestamp;
 
         dual_timestamp condition_timestamp;

+        dual_timestamp assert_timestamp;

 
         dual_timestamp inactive_exit_timestamp;
         dual_timestamp active_enter_timestamp;
 
         dual_timestamp inactive_exit_timestamp;
         dual_timestamp active_enter_timestamp;


@@ -212,6 +214,7 @@ struct Unit {
 
         /* Did the last condition check succeed? */
         bool condition_result;
 
         /* Did the last condition check succeed? */
         bool condition_result;

+        bool assert_result;

 
         /* Is this a transient unit? */
         bool transient;
 
         /* Is this a transient unit? */
         bool transient;