udev: remove old lfs rule that let lsusb shows devices twice.

diff --git a/lfs/udev b/lfs/udev
index 2b091bbd9d7f383637e3a728e71ceda4a46096e3..c7cba71387079ebdad7fd58148a20283dbc8aeff 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2010  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -107,6 +107,7 @@ else
        rm -rf /lib/udev/devices
        cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
        cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch
        install -dv /lib/{firmware,udev/devices/{pts,shm}}
        echo "Put device firmwares here ..." > /lib/firmware/dirinfo
        mknod -m0666 /lib/udev/devices/null c 1 3

diff --git a/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch b/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch
new file mode 100644 (file)
index 0000000..ef02bf7
--- /dev/null
+++ b/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch
@@ -0,0 +1,11 @@
+diff -Naur udev-config-6.2.org/25-lfs.rules udev-config-6.2/25-lfs.rules
+--- udev-config-6.2.org/25-lfs.rules   2006-07-14 23:29:28.000000000 +0200
++++ udev-config-6.2/25-lfs.rules       2010-12-21 18:55:40.375602794 +0100
+@@ -84,7 +84,6 @@
+ 
+ # USB devices go in their own subdirectory
+ 
+-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", NAME="%c"
+ KERNEL=="hiddev*",          NAME="usb/%k"
+ KERNEL=="auer*",            NAME="usb/%k"
+ KERNEL=="legousbtower*",    NAME="usb/%k"