Просмотр исходного кода

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
Felix Fietkau 18 лет назад
Родитель
Сommit
5e7cb507cd

+ 3 - 0
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 ;
+}

+ 1 - 1
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

+ 0 - 12
target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules

@@ -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 ;
-}

+ 0 - 1
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