system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19446 from poettering/logind-trigger-new

Browse source 
logind/dissect: use sd_device_trigger() more
This commit is contained in:
Lennart Poettering 2021-04-28 13:26:29 +02:00 committed by GitHub
parent 5ed0ea2928 b64c4ece74
commit 53515c6939
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/login/logind-dbus.c
View file

@ -1319,18 +1319,9 @@ static int trigger_device(Manager *m, sd_device *d) {
}
FOREACH_DEVICE(e, d) {
_cleanup_free_ char *t = NULL;
const char *p;
r = sd_device_get_syspath(d, &p);
r = sd_device_trigger(d, SD_DEVICE_CHANGE);
if (r < 0)
return r;
t = path_join(p, "uevent");
if (!t)
return -ENOMEM;
(void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
log_device_debug_errno(d, r, "Failed to trigger device, ignoring: %m");
}
return 0;

29
src/shared/dissect-image.c
View file

@ -432,7 +432,6 @@ static int device_wait_for_initialization_harder(
usec_t deadline,
sd_device **ret) {
_cleanup_free_ char *uevent = NULL;
usec_t start, left, retrigger_timeout;
int r;
@ -444,7 +443,8 @@ static int device_wait_for_initialization_harder(
const char *sn = NULL;
(void) sd_device_get_sysname(device, &sn);
log_debug("Waiting for device '%s' to initialize for %s.", strna(sn), format_timespan(buf, sizeof(buf), left, 0));
log_device_debug(device,
"Waiting for device '%s' to initialize for %s.", strna(sn), format_timespan(buf, sizeof(buf), left, 0));
}
if (left != USEC_INFINITY)
@ -475,33 +475,24 @@ static int device_wait_for_initialization_harder(
const char *sn = NULL;
(void) sd_device_get_sysname(device, &sn);
log_debug("Successfully waited for device '%s' to initialize for %s.", strna(sn), format_timespan(buf, sizeof(buf), usec_sub_unsigned(now(CLOCK_MONOTONIC), start), 0));
log_device_debug(device,
"Successfully waited for device '%s' to initialize for %s.",
strna(sn),
format_timespan(buf, sizeof(buf), usec_sub_unsigned(now(CLOCK_MONOTONIC), start), 0));
}
if (r != -ETIMEDOUT || last_try)
return r;
if (!uevent) {
const char *syspath;
r = sd_device_get_syspath(device, &syspath);
if (r < 0)
return r;
uevent = path_join(syspath, "uevent");
if (!uevent)
return -ENOMEM;
}
if (DEBUG_LOGGING) {
char buf[FORMAT_TIMESPAN_MAX];
log_debug("Device didn't initialize within %s, assuming lost event. Retriggering device through %s.",
format_timespan(buf, sizeof(buf), usec_sub_unsigned(now(CLOCK_MONOTONIC), start), 0),
uevent);
log_device_debug(device,
"Device didn't initialize within %s, assuming lost event. Retriggering device.",
format_timespan(buf, sizeof(buf), usec_sub_unsigned(now(CLOCK_MONOTONIC), start), 0));
}
r = write_string_file(uevent, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
r = sd_device_trigger(device, SD_DEVICE_CHANGE);
if (r < 0)
return r;
}