pcmciautils/pcmciautils-014-newrules.patch
2007-09-07 06:01:30 +00:00

30 lines
1.5 KiB
Diff

diff -up pcmciautils-014/udev/rules-modprobe.newrule pcmciautils-014/udev/rules-modprobe
--- pcmciautils-014/udev/rules-modprobe.newrule 2006-06-01 11:07:52.000000000 +0200
+++ pcmciautils-014/udev/rules-modprobe 2007-08-22 13:11:48.000000000 +0200
@@ -1,3 +1,4 @@
+### Already done by the general modprobe rule
# modprobe $modalias loads all possibly appropriate modules
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
- RUN+="/sbin/modprobe $modalias"
+#ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+# RUN+="/sbin/modprobe $env{MODALIAS}"
diff -up pcmciautils-014/udev/rules-base.newrule pcmciautils-014/udev/rules-base
--- pcmciautils-014/udev/rules-base.newrule 2006-06-01 11:07:52.000000000 +0200
+++ pcmciautils-014/udev/rules-base 2007-08-22 13:17:40.000000000 +0200
@@ -3,13 +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=="?*", \
- RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1"
# PCMCIA sockets:
#