KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

procd: make the preinit rules wildcard all buttons for failsafe

Browse source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36896
This commit is contained in:
John Crispin 2013-06-10 08:24:44 +00:00
parent 9c01967ab7
commit e078f649b5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/base-files/files/lib/preinit/30_failsafe_wait
View file

@ -78,8 +78,9 @@ failsafe_wait() {
pi_failsafe_net_message=true pi_failsafe_net_message=true
preinit_net_echo "Please press button now to enter failsafe" preinit_net_echo "Please press button now to enter failsafe"
pi_failsafe_net_message=false pi_failsafe_net_message=false
fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true
[ -f "/tmp/failsafe_button" ] && FAILSAFE=true && export FAILSAFE && rm /tmp/failsafe_button [ -f "/tmp/failsafe_button" ] && FAILSAFE=true
[ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe
fi fi
} }

1
package/procd/files/hotplug-preinit.json
View file

@ -14,7 +14,6 @@
[ "if", [ "if",
[ "and", [ "and",
[ "eq", "SUBSYSTEM", "button" ], [ "eq", "SUBSYSTEM", "button" ],
[ "eq", "BUTTON", "reset" ],
], ],
[ "exec", "/etc/rc.button/failsafe" ] [ "exec", "/etc/rc.button/failsafe" ]
], ],