summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-30 21:09:02 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-30 21:09:02 +0000
commit3462ef2525e7e3a26bf3784abe698d58ea446b85 (patch)
tree5b9c6abdaa11014c66cb58f6002555cc259cee7a
parent101062e0813248080d9bf1baa14ae06af0042df4 (diff)
move parts of the failsafe code to the generic base-files - will be used on atheros as well as soon as i've added support for it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7810 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/etc/hotplug2-init.rules3
-rwxr-xr-xpackage/base-files/files/etc/preinit2
-rw-r--r--target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules12
-rwxr-xr-xtarget/linux/brcm-2.4/base-files/default/etc/preinit.arch1
4 files changed, 4 insertions, 14 deletions
diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
index 6efd546689..098ad047a7 100644
--- 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 e5fdd43ae1..8163f79ae6 100755
--- 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
index 098ad047a7..0000000000
--- 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 ec171c356e..a0d97c68bc 100755
--- 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