move parts of the failsafe code to the generic base-files - will be used on atheros...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7810 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
index 6efd5466891c1023673674af2fa50aaad92f65c5..098ad047a7f6b95ea3f208f5d80558ea40db8f10 100644 (file)
--- a/package/base-files/files/etc/hotplug2-init.rules
+++ b/package/base-files/files/etc/hotplug2-init.rules
@@ -7,3 +7,6 @@ DEVPATH is set {
        makedev /dev/%DEVICENAME% 0644
 }
 
+SUBSYSTEM ~~ button {
+       exec kill -USR1 1 ;
+}

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index e5fdd43ae1a9f293b2978ae9204f7e5f419effaa..8163f79ae69e776986cc973a33c14995305c318c 100755 (executable)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -44,7 +44,7 @@ dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && {
 exec <$M0 >$M1 2>&0
 
 echo "- preinit -"
-
+trap 'FAILSAFE=true' USR1
 [ -e /etc/preinit.arch ] && . /etc/preinit.arch
 set_state preinit
 echo "$HOTPLUG" > /proc/sys/kernel/hotplug

diff --git a/target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules b/target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules
deleted file mode 100644 (file)
index 098ad04..0000000
--- a/target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-DEVICENAME ~~ (tun|tap[0-9]) {
-       makedev /dev/net/%DEVICENAME% 0644
-       next
-}
-
-DEVPATH is set {
-       makedev /dev/%DEVICENAME% 0644
-}
-
-SUBSYSTEM ~~ button {
-       exec kill -USR1 1 ;
-}

diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch b/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
index ec171c356ef4efeece72c12065c421475f04a4ed..a0d97c68bc183c7f07defbe8527d8b903e7a667e 100755 (executable)
--- a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
+++ b/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
@@ -28,7 +28,6 @@ mount none /proc -t proc
 
 insmod diag
 set_state preinit
-trap 'FAILSAFE=true' USR1
 echo '/sbin/hotplug.failsafe' > /proc/sys/kernel/hotplug
 
 ifname=eth0