mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 01:55:22 +03:00
core: add new ConditionNeedsUpdate= unit condition
This new condition allows checking whether /etc or /var are out-of-date relative to /usr. This is the counterpart for the update flag managed by systemd-update-done.service. Services that want to be started once after /usr got updated should use: [Unit] ConditionNeedsUpdate=/etc Before=systemd-update-done.service This makes sure that they are only run if /etc is out-of-date relative to /usr. And that it will be executed after systemd-update-done.service which is responsible for marking /etc up-to-date relative to the current /usr. ConditionNeedsUpdate= will also checks whether /etc is actually writable, and not trigger if it isn't, since no update is possible then.
This commit is contained in:
parent
8ea48dfcd3
commit
a55654d598
@ -90,6 +90,36 @@ static bool condition_test_capability(Condition *c) {
|
|||||||
return !!(capabilities & (1ULL << value)) == !c->negate;
|
return !!(capabilities & (1ULL << value)) == !c->negate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool condition_test_needs_update(Condition *c) {
|
||||||
|
const char *p;
|
||||||
|
struct stat usr, other;
|
||||||
|
|
||||||
|
assert(c);
|
||||||
|
assert(c->parameter);
|
||||||
|
assert(c->type == CONDITION_NEEDS_UPDATE);
|
||||||
|
|
||||||
|
/* If the file system is read-only we shouldn't suggest an update */
|
||||||
|
if (path_is_read_only_fs(c->parameter) > 0)
|
||||||
|
return c->negate;
|
||||||
|
|
||||||
|
/* Any other failure means we should allow the condition to be true,
|
||||||
|
* so that we rather invoke too many update tools then too
|
||||||
|
* few. */
|
||||||
|
|
||||||
|
if (!path_is_absolute(c->parameter))
|
||||||
|
return !c->negate;
|
||||||
|
|
||||||
|
p = strappenda(c->parameter, "/.updated");
|
||||||
|
if (lstat(p, &other) < 0)
|
||||||
|
return !c->negate;
|
||||||
|
|
||||||
|
if (lstat("/usr/", &usr) < 0)
|
||||||
|
return !c->negate;
|
||||||
|
|
||||||
|
return (usr.st_mtim.tv_sec > other.st_mtim.tv_sec ||
|
||||||
|
(usr.st_mtim.tv_sec == other.st_mtim.tv_sec && usr.st_mtim.tv_nsec > other.st_mtim.tv_nsec)) == !c->negate;
|
||||||
|
}
|
||||||
|
|
||||||
static bool condition_test(Condition *c) {
|
static bool condition_test(Condition *c) {
|
||||||
assert(c);
|
assert(c);
|
||||||
|
|
||||||
@ -169,6 +199,9 @@ static bool condition_test(Condition *c) {
|
|||||||
case CONDITION_ARCHITECTURE:
|
case CONDITION_ARCHITECTURE:
|
||||||
return condition_test_architecture(c);
|
return condition_test_architecture(c);
|
||||||
|
|
||||||
|
case CONDITION_NEEDS_UPDATE:
|
||||||
|
return condition_test_needs_update(c);
|
||||||
|
|
||||||
case CONDITION_NULL:
|
case CONDITION_NULL:
|
||||||
return !c->negate;
|
return !c->negate;
|
||||||
|
|
||||||
|
@ -161,6 +161,7 @@ Unit.ConditionPathIsReadWrite, config_parse_unit_condition_path, CONDITION_P
|
|||||||
Unit.ConditionDirectoryNotEmpty, config_parse_unit_condition_path, CONDITION_DIRECTORY_NOT_EMPTY, 0
|
Unit.ConditionDirectoryNotEmpty, config_parse_unit_condition_path, CONDITION_DIRECTORY_NOT_EMPTY, 0
|
||||||
Unit.ConditionFileNotEmpty, config_parse_unit_condition_path, CONDITION_FILE_NOT_EMPTY, 0
|
Unit.ConditionFileNotEmpty, config_parse_unit_condition_path, CONDITION_FILE_NOT_EMPTY, 0
|
||||||
Unit.ConditionFileIsExecutable, config_parse_unit_condition_path, CONDITION_FILE_IS_EXECUTABLE, 0
|
Unit.ConditionFileIsExecutable, config_parse_unit_condition_path, CONDITION_FILE_IS_EXECUTABLE, 0
|
||||||
|
Unit.ConditionNeedsUpdate, config_parse_unit_condition_path, CONDITION_NEEDS_UPDATE, 0
|
||||||
Unit.ConditionKernelCommandLine, config_parse_unit_condition_string, CONDITION_KERNEL_COMMAND_LINE, 0
|
Unit.ConditionKernelCommandLine, config_parse_unit_condition_string, CONDITION_KERNEL_COMMAND_LINE, 0
|
||||||
Unit.ConditionArchitecture, config_parse_unit_condition_string, CONDITION_ARCHITECTURE, 0
|
Unit.ConditionArchitecture, config_parse_unit_condition_string, CONDITION_ARCHITECTURE, 0
|
||||||
Unit.ConditionVirtualization, config_parse_unit_condition_string, CONDITION_VIRTUALIZATION, 0
|
Unit.ConditionVirtualization, config_parse_unit_condition_string, CONDITION_VIRTUALIZATION, 0
|
||||||
|
@ -256,6 +256,7 @@ static const char* const condition_type_table[_CONDITION_TYPE_MAX] = {
|
|||||||
[CONDITION_HOST] = "ConditionHost",
|
[CONDITION_HOST] = "ConditionHost",
|
||||||
[CONDITION_AC_POWER] = "ConditionACPower",
|
[CONDITION_AC_POWER] = "ConditionACPower",
|
||||||
[CONDITION_ARCHITECTURE] = "ConditionArchitecture",
|
[CONDITION_ARCHITECTURE] = "ConditionArchitecture",
|
||||||
|
[CONDITION_NEEDS_UPDATE] = "ConditionNeedsUpdate",
|
||||||
[CONDITION_NULL] = "ConditionNull"
|
[CONDITION_NULL] = "ConditionNull"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -44,6 +44,7 @@ typedef enum ConditionType {
|
|||||||
CONDITION_HOST,
|
CONDITION_HOST,
|
||||||
CONDITION_AC_POWER,
|
CONDITION_AC_POWER,
|
||||||
CONDITION_ARCHITECTURE,
|
CONDITION_ARCHITECTURE,
|
||||||
|
CONDITION_NEEDS_UPDATE,
|
||||||
CONDITION_NULL,
|
CONDITION_NULL,
|
||||||
_CONDITION_TYPE_MAX,
|
_CONDITION_TYPE_MAX,
|
||||||
_CONDITION_TYPE_INVALID = -1
|
_CONDITION_TYPE_INVALID = -1
|
||||||
|
@ -14,6 +14,8 @@ After=systemd-readahead-collect.service systemd-readahead-replay.service local-f
|
|||||||
Before=sysinit.target shutdown.target
|
Before=sysinit.target shutdown.target
|
||||||
RefuseManualStart=yes
|
RefuseManualStart=yes
|
||||||
RefuseManualStop=yes
|
RefuseManualStop=yes
|
||||||
|
ConditionNeedsUpdate=|/etc
|
||||||
|
ConditionNeedsUpdate=|/var
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
|
Loading…
Reference in New Issue
Block a user