shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

Revert "device : reload when udev generates a "changed" event" (#6836)

Browse Source 
This reverts commit 0ffddc6e2c. That
causes a rather severe disruption of D-Bus and other services when e. g.
restarting local-fs.target (as spotted by the "storage" test regression).

Fixes #6834
This commit is contained in:
Martin Pitt 2017-09-15 09:21:49 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent ab2116b140
commit 6d44591141
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/systemd.device.xml
View File

@ -83,12 +83,6 @@
the escaping logic used to convert a file system path to a unit the escaping logic used to convert a file system path to a unit
name see name see
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>Device units will be reloaded by systemd whenever the
corresponding device generates a <literal>changed</literal> event.
Other units can use <varname>ReloadPropagatedFrom=</varname> to react
to that event</para>
</refsect1> </refsect1>
<refsect1> <refsect1>

22
src/core/device.c
View File

@ -766,27 +766,7 @@ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
return 0; return 0;
} }
if (streq(action, "change")) { if (streq(action, "remove")) {
_cleanup_free_ char *e = NULL;
Unit *u;
r = unit_name_from_path(sysfs, ".device", &e);
if (r < 0)
return log_error_errno(r, "Failed to generate unit name from device path: %m");
u = manager_get_unit(m, e);
if (!u) {
log_error("Failed to get unit from sysfs name.");
return 0;
}
r = manager_add_job(m, JOB_RELOAD, u, JOB_REPLACE, NULL, NULL);
if (r < 0) {
log_error_errno(r, "Failed to add job to manager : %m");
return 0;
}
} else if (streq(action, "remove")) {
r = swap_process_device_remove(m, dev); r = swap_process_device_remove(m, dev);
if (r < 0) if (r < 0)
log_error_errno(r, "Failed to process swap device remove event: %m"); log_error_errno(r, "Failed to process swap device remove event: %m");