diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2006-11-03 11:33:38 -0500 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-11-03 11:33:38 -0500 |
| commit | 3a5217492c1f95711b30f4e27c51563dff6ceb3e (patch) | |
| tree | c4af6b5be2fa5cfaa10235e4dc3ede2ab464b6f7 | |
| parent | 774fa8f770e20b3a8680da2a9cfc48e3f42443d0 (diff) | |
| download | pcmciautils-3a5217492c1f95711b30f4e27c51563dff6ceb3e.tar.gz | |
[PATCH] fix for udev-094
from udev's release notes:
"udev 094
========
The built-in MODALIAS key and substitution is removed.
(...)
udev 080
========
(...)
MODALIAS and $modalias is not needed and will be removed from one of
the next udev versions, replace it in all rules with ENV{MODALIAS} or
the sysfs "modalias" value."
here is a patch to fix this issue
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| -rw-r--r-- | udev/rules-base | 4 | ||||
| -rw-r--r-- | udev/rules-modprobe | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/udev/rules-base b/udev/rules-base index c6d14de..6ed3a27 100644 --- a/udev/rules-base +++ b/udev/rules-base @@ -3,12 +3,12 @@ # are so broken that we need to read out random bytes of it # instead of the manufactor, card or product ID. Then the # matching is done in userspace. -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ +ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ RUN+="/sbin/pcmcia-check-broken-cis" # However, the "weak" matching by func_id is only allowed _after_ modprobe # returns, so that "strong" matches have a higher priority. -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ +ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'" # PCMCIA sockets: diff --git a/udev/rules-modprobe b/udev/rules-modprobe index ea1f44a..a13b2ad 100644 --- a/udev/rules-modprobe +++ b/udev/rules-modprobe @@ -1,3 +1,3 @@ -# modprobe $modalias loads all possibly appropriate modules -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ - RUN+="/sbin/modprobe $modalias" +# modprobe $env{MODALIAS} loads all possibly appropriate modules +ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ + RUN+="/sbin/modprobe $env{MODALIAS}" |