From 82c07e28f2a2e973febd454d3f8666d4f155d0b4 Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Wed, 8 Feb 2023 20:43:42 +0100 Subject: [PATCH] udev: load the required kernel modules Loading the required kernel modules such as ledtrig-pattern via /etc/modules-load.d may introduce a race condition on some systems such as non-systemd based distros. Load the kernel modules using the builtin 'kmod load' udev command instead. --- debian/feedbackd.install | 1 - debian/feedbackd.udev | 4 ++-- debian/modules-load.d/feedbackd.conf | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 debian/modules-load.d/feedbackd.conf diff --git a/debian/feedbackd.install b/debian/feedbackd.install index 44fc975..97b1d10 100644 --- a/debian/feedbackd.install +++ b/debian/feedbackd.install @@ -1,4 +1,3 @@ -debian/modules-load.d etc/ /usr/bin/ /usr/libexec/ /usr/share/dbus-1/ diff --git a/debian/feedbackd.udev b/debian/feedbackd.udev index 5320b89..4c88fa5 100644 --- a/debian/feedbackd.udev +++ b/debian/feedbackd.udev @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="feedbackd_end" SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ENV{ID_PATH}=="platform-vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra" # See include/dt-bindings/leds/common.h in the linux kernel -SUBSYSTEM=="leds", DEVPATH=="*/*:status", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd" -SUBSYSTEM=="leds", DEVPATH=="*/*:indicator", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd" +SUBSYSTEM=="leds", DEVPATH=="*/*:status", ENV{FEEDBACKD_TYPE}="led", RUN{builtin}+="kmod load ledtrig-pattern", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd" +SUBSYSTEM=="leds", DEVPATH=="*/*:indicator", ENV{FEEDBACKD_TYPE}="led", RUN{builtin}+="kmod load ledtrig-pattern", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd" LABEL="feedbackd_end" diff --git a/debian/modules-load.d/feedbackd.conf b/debian/modules-load.d/feedbackd.conf deleted file mode 100644 index a42bff4..0000000 --- a/debian/modules-load.d/feedbackd.conf +++ /dev/null @@ -1 +0,0 @@ -ledtrig-pattern