Merge pull request #3760 from poettering/rfkill-fix
rfkill dead-lock fix
This commit is contained in:
commit
be1354d8df
|
@ -184,10 +184,10 @@
|
|||
to such a parent device. On failure, <constant>NULL</constant>
|
||||
is returned.</para>
|
||||
|
||||
<para>On success, <function>udev_device_get_is_initialized()</function>
|
||||
returns either <constant>1</constant> or <constant>0</constant>,
|
||||
depending on whether the passed device is initialized or not. On
|
||||
failure, a negative error code is returned.</para>
|
||||
<para>On success, <function>udev_device_get_is_initialized()</function> returns either <constant>1</constant> or
|
||||
<constant>0</constant>, depending on whether the passed device has already been initialized by udev or not. On
|
||||
failure, a negative error code is returned. Note that devices for which no udev rules are defined are never
|
||||
reported initialized.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
|
|
|
@ -56,8 +56,7 @@ SUBSYSTEM=="backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_W
|
|||
SUBSYSTEM=="leds", KERNEL=="*kbd_backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@leds:$name.service"
|
||||
|
||||
# Pull in rfkill save/restore for all rfkill devices
|
||||
|
||||
SUBSYSTEM=="rfkill", IMPORT{builtin}="path_id"
|
||||
SUBSYSTEM=="rfkill", ENV{SYSTEMD_RFKILL}="1", IMPORT{builtin}="path_id"
|
||||
SUBSYSTEM=="misc", KERNEL=="rfkill", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-rfkill.socket"
|
||||
|
||||
# Asynchronously mount file systems implemented by these modules as soon as they are loaded.
|
||||
|
|
Loading…
Reference in a new issue