X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2Fgentoo%2F30-kernel-compat.rules;h=95da1522d32cd705a4fc20bc4c2bee567b3fc0b4;hp=1f767df8d8613e7380b30732f18fe15e092bd856;hb=7e8ea3320d194f34393224e4cecb39fbc8c94e57;hpb=282988c4f8a85c28468e6442e86efe51dc71cc93

diff --git a/rules/gentoo/30-kernel-compat.rules b/rules/gentoo/30-kernel-compat.rules
index 1f767df8d..95da1522d 100644
--- a/rules/gentoo/30-kernel-compat.rules
+++ b/rules/gentoo/30-kernel-compat.rules
@@ -1,47 +1,28 @@
 # do not edit this file, it will be overwritten on update
 
-ACTION!="add", GOTO="kernel_compat_end"
-
-# workarounds needed to synchronize with sysfs
-DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-
-# needed for kernels <2.6.16
-SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-
-# needed for kernels <2.6.17
-SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
-
-
+ACTION!="add|change", GOTO="kernel_compat_end"
 
-# needed for kernels <2.6.22
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
+#
+# naming device rules
+#
 
+# dvb device naming
+# needed for kernels <2.6.29-rc1
+SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
-
-# this driver is broken and should not be loaded automatically
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398962
-# needed for kernels <2.6.21
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", ENV{MODALIAS}=""
+#
+# module loading rules
+#
+ACTION!="add", GOTO="kernel_compat_end"
 
 # No need for more code, as MODALIAS is present
 ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
 
-# needed for kernels <2.6.22
-SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="0|7|14",	RUN+="/sbin/modprobe sd_mod"
-	ATTRS{type}=="4|5",	RUN+="/sbin/modprobe sr_mod"
-	ATTRS{type}=="8",	RUN+="/sbin/modprobe ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst", GOTO="kernel_compat_end"
-	ATTRS{type}=="1", RUN+="/sbin/modprobe st"
-
-LABEL="kernel_compat_end"
+# needed for kernel <2.6.30-rc1
+SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch"
 
+# needed for kernel <2.6.27-rc5
+# acpi will do on newer kernels
+SUBSYSTEM=="pnp", DRIVER!="?*", \
+  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"