mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
use hotplug2 for serializing hotplug events on 2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7097 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -21,7 +21,6 @@ include $(INCLUDE_DIR)/package.mk
|
||||
define Package/hotplug2
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
DEPENDS:=@LINUX_2_6 +udevtrigger
|
||||
TITLE:=Dynamic device management subsystem for embedded systems
|
||||
URL:=http://isteve.bofh.cz/~isteve/hotplug2/
|
||||
endef
|
||||
@@ -32,6 +31,9 @@ in a tiny pack, intended for Linux early userspace: Init RAM FS and InitRD.
|
||||
endef
|
||||
|
||||
define Package/hotplug2/install
|
||||
$(INSTALL_DIR) $(1)/etc
|
||||
$(INSTALL_DATA) ./files/hotplug2.rules $(1)/etc/
|
||||
$(INSTALL_DATA) ./files/hotplug2-init.rules $(1)/etc/
|
||||
$(INSTALL_DIR) $(1)/sbin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hotplug2 $(1)/sbin/
|
||||
endef
|
||||
|
||||
9
package/hotplug2/files/hotplug2-init.rules
Normal file
9
package/hotplug2/files/hotplug2-init.rules
Normal file
@@ -0,0 +1,9 @@
|
||||
DEVICENAME ~~ (tun|tap[0-9]) {
|
||||
makedev /dev/net/%DEVICENAME% 0644
|
||||
next
|
||||
}
|
||||
|
||||
DEVPATH is set {
|
||||
makedev /dev/%DEVICENAME% 0644
|
||||
}
|
||||
|
||||
12
package/hotplug2/files/hotplug2.rules
Normal file
12
package/hotplug2/files/hotplug2.rules
Normal file
@@ -0,0 +1,12 @@
|
||||
DEVICENAME ~~ (tun|tap[0-9]) {
|
||||
makedev /dev/net/%DEVICENAME% 0644
|
||||
next
|
||||
}
|
||||
|
||||
DEVPATH is set {
|
||||
makedev /dev/%DEVICENAME% 0644
|
||||
}
|
||||
|
||||
SUBSYSTEM ~~ (net|button) {
|
||||
exec /sbin/hotplug-call %SUBSYSTEM%;
|
||||
}
|
||||
34
package/hotplug2/patches/100-rules_override.patch
Normal file
34
package/hotplug2/patches/100-rules_override.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
diff -ur hotplug2.old/hotplug2.c hotplug2.dev/hotplug2.c
|
||||
--- hotplug2.old/hotplug2.c 2006-10-08 15:18:23.000000000 +0200
|
||||
+++ hotplug2.dev/hotplug2.c 2007-05-05 11:38:51.456551560 +0200
|
||||
@@ -391,6 +391,7 @@
|
||||
int rv = 0;
|
||||
int i;
|
||||
char *coldplug_command = NULL;
|
||||
+ char *rules_file = HOTPLUG2_RULE_PATH;
|
||||
sigset_t block_mask;
|
||||
|
||||
struct rules_t *rules = NULL;
|
||||
@@ -435,6 +436,13 @@
|
||||
break;
|
||||
|
||||
modprobe_command = *argv;
|
||||
+ } else if (!strcmp(*argv, "--set-rules-file")) {
|
||||
+ argv++;
|
||||
+ argc--;
|
||||
+ if (argc <= 0)
|
||||
+ break;
|
||||
+
|
||||
+ rules_file = *argv;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -443,7 +451,7 @@
|
||||
#ifdef HAVE_RULES
|
||||
if (!dumb) {
|
||||
filemap = MAP_FAILED;
|
||||
- rule_fd = open(HOTPLUG2_RULE_PATH, O_RDONLY | O_NOATIME);
|
||||
+ rule_fd = open(rules_file, O_RDONLY | O_NOATIME);
|
||||
if (rule_fd == -1) {
|
||||
dumb = 1;
|
||||
ERROR("rules parse","Unable to open rules file: %s.", strerror(errno));
|
||||
Reference in New Issue
Block a user