diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-30 21:09:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-30 21:09:02 +0000 |
| commit | 5e7cb507cdb00f627ca1dc14faca87eff0f1de70 (patch) | |
| tree | c5b0f60f401f76b91d9328c75130919b89759877 | |
| parent | f95db8bac8334bbf5add2b4dbf1b13a064295dc7 (diff) | |
| download | upstream-5e7cb507cdb00f627ca1dc14faca87eff0f1de70.tar.gz upstream-5e7cb507cdb00f627ca1dc14faca87eff0f1de70.tar.bz2 upstream-5e7cb507cdb00f627ca1dc14faca87eff0f1de70.zip | |
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
SVN-Revision: 7810
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 |