X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Funit.h;h=aa80aadb1b79d2bb88f76c716fcd764ba9b3afe8;hb=c0115b1f4a09b709a2d062a4f2baf21203c808bd;hp=70b3c9a4c104985896bc5358c4b6124ea940b7f5;hpb=6398320759ce4ed84922bb28f715d3c6c66166c4;p=elogind.git diff --git a/src/unit.h b/src/unit.h index 70b3c9a4c..aa80aadb1 100644 --- a/src/unit.h +++ b/src/unit.h @@ -78,8 +78,9 @@ enum UnitLoadState { enum UnitActiveState { UNIT_ACTIVE, - UNIT_ACTIVE_RELOADING, + UNIT_RELOADING, UNIT_INACTIVE, + UNIT_MAINTENANCE, UNIT_ACTIVATING, UNIT_DEACTIVATING, _UNIT_ACTIVE_STATE_MAX, @@ -87,15 +88,19 @@ enum UnitActiveState { }; static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_RELOADING; } static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_RELOADING; } static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_DEACTIVATING; + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING; +} + +static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) { + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE; } enum UnitDependency {