mirror of
https://github.com/systemd/systemd
synced 2026-03-31 20:24:50 +02:00
Compare commits
No commits in common. "8c236eca78052d1b8dba8bf22ed12b621a5b609d" and "6de1c6892414b39f675ef3ee41b483bd97d352b9" have entirely different histories.
8c236eca78
...
6de1c68924
@ -73,7 +73,7 @@ int efi_get_variable(
|
|||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_debug_errno(r, "EFI variable '%s' is not a regular file, refusing: %m", p);
|
return log_debug_errno(r, "EFI variable '%s' is not a regular file, refusing: %m", p);
|
||||||
|
|
||||||
if (st.st_size == 0) /* for uncommitted variables, see below */
|
if (st.st_size == 0) /* for uncommited variables, see below */
|
||||||
return log_debug_errno(SYNTHETIC_ERRNO(ENOENT), "EFI variable '%s' is uncommitted", p);
|
return log_debug_errno(SYNTHETIC_ERRNO(ENOENT), "EFI variable '%s' is uncommitted", p);
|
||||||
if ((uint64_t) st.st_size < sizeof(attr))
|
if ((uint64_t) st.st_size < sizeof(attr))
|
||||||
return log_debug_errno(SYNTHETIC_ERRNO(ENODATA), "EFI variable '%s' is shorter than %zu bytes, refusing.", p, sizeof(attr));
|
return log_debug_errno(SYNTHETIC_ERRNO(ENODATA), "EFI variable '%s' is shorter than %zu bytes, refusing.", p, sizeof(attr));
|
||||||
|
|||||||
@ -127,7 +127,7 @@ static int on_filter_reply(
|
|||||||
/* When we are are disconnected, that's fine, maybe the other side wants to clean up
|
/* When we are are disconnected, that's fine, maybe the other side wants to clean up
|
||||||
* open connections every now and then, or is being restarted and thus a moment
|
* open connections every now and then, or is being restarted and thus a moment
|
||||||
* offline. Try to reconnect immediately to recover. However, a service that
|
* offline. Try to reconnect immediately to recover. However, a service that
|
||||||
* continuously fails should not be able to get us into a busy loop, hence we apply a
|
* continously fails should not be able to get us into a busy loop, hence we apply a
|
||||||
* ratelimit, and when it is hit we stop reconnecting. */
|
* ratelimit, and when it is hit we stop reconnecting. */
|
||||||
if (ratelimit_below(&h->reconnect_ratelimit)) {
|
if (ratelimit_below(&h->reconnect_ratelimit)) {
|
||||||
log_debug("Connection terminated while querying filter of hook '%s', trying to reconnect.", h->socket_path);
|
log_debug("Connection terminated while querying filter of hook '%s', trying to reconnect.", h->socket_path);
|
||||||
@ -227,7 +227,7 @@ static int hook_acquire_filter(Hook *h) {
|
|||||||
if (r <= 0)
|
if (r <= 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
/* Turn off timeout, after all we want to continuously monitor filter changes */
|
/* Turn off timeout, after all we want to continously monitor filter changes */
|
||||||
r = sd_varlink_set_relative_timeout(v, UINT64_MAX);
|
r = sd_varlink_set_relative_timeout(v, UINT64_MAX);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_error_errno(r, "Failed to disable timeout on Varlink connection %m");
|
return log_error_errno(r, "Failed to disable timeout on Varlink connection %m");
|
||||||
|
|||||||
@ -47,7 +47,7 @@ static SD_VARLINK_DEFINE_METHOD(
|
|||||||
"as one. Partial success/failure combinations are not supported."),
|
"as one. Partial success/failure combinations are not supported."),
|
||||||
SD_VARLINK_DEFINE_INPUT_BY_TYPE(question, Question, SD_VARLINK_ARRAY),
|
SD_VARLINK_DEFINE_INPUT_BY_TYPE(question, Question, SD_VARLINK_ARRAY),
|
||||||
SD_VARLINK_FIELD_COMMENT("A DNS response code. If a hook sets this return parameter further processing of the lookup via "
|
SD_VARLINK_FIELD_COMMENT("A DNS response code. If a hook sets this return parameter further processing of the lookup via "
|
||||||
"regular protocols such as DNS, LLMNR, mDNS is skipped, and the return code returned immediately. "
|
"regular proocols such as DNS, LLMNR, mDNS is skipped, and the return code returned immediately. "
|
||||||
"In other words, if a hook intends to let the request pass to normal resolution, it should not "
|
"In other words, if a hook intends to let the request pass to normal resolution, it should not "
|
||||||
"set this return parameter."),
|
"set this return parameter."),
|
||||||
SD_VARLINK_DEFINE_OUTPUT(rcode, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
|
SD_VARLINK_DEFINE_OUTPUT(rcode, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
|
||||||
@ -76,6 +76,6 @@ SD_VARLINK_DEFINE_INTERFACE(
|
|||||||
"services can send updates to the filter at any time. Whenever a further reply is sent the "
|
"services can send updates to the filter at any time. Whenever a further reply is sent the "
|
||||||
"filter configured therein fully replaces any previously communicated filter."),
|
"filter configured therein fully replaces any previously communicated filter."),
|
||||||
&vl_method_QueryFilter,
|
&vl_method_QueryFilter,
|
||||||
SD_VARLINK_SYMBOL_COMMENT("Sent whenever a resolution request is made. This typically takes the filter parameters returned "
|
SD_VARLINK_SYMBOL_COMMENT("Sent whenever a resolution request is made. This typically takes the filter paramaters returned "
|
||||||
"by QueryFilter() into account, but this is not guaranteed."),
|
"by QueryFilter() into account, but this is not guaranteed."),
|
||||||
&vl_method_ResolveRecord);
|
&vl_method_ResolveRecord);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user