From e078f649b5a5aa9f585b0a226fd14aad90c084af Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 10 Jun 2013 08:24:44 +0000 Subject: [PATCH] procd: make the preinit rules wildcard all buttons for failsafe Signed-off-by: John Crispin SVN-Revision: 36896 --- package/base-files/files/lib/preinit/30_failsafe_wait | 5 +++-- package/procd/files/hotplug-preinit.json | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait index 5d6def72ac3..3c5ece9f76f 100644 --- a/package/base-files/files/lib/preinit/30_failsafe_wait +++ b/package/base-files/files/lib/preinit/30_failsafe_wait @@ -78,8 +78,9 @@ failsafe_wait() { pi_failsafe_net_message=true preinit_net_echo "Please press button now to enter failsafe" pi_failsafe_net_message=false - fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE - [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && export FAILSAFE && rm /tmp/failsafe_button + fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true + [ -f "/tmp/failsafe_button" ] && FAILSAFE=true + [ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe fi } diff --git a/package/procd/files/hotplug-preinit.json b/package/procd/files/hotplug-preinit.json index d212b22fac3..614b1047115 100644 --- a/package/procd/files/hotplug-preinit.json +++ b/package/procd/files/hotplug-preinit.json @@ -14,7 +14,6 @@ [ "if", [ "and", [ "eq", "SUBSYSTEM", "button" ], - [ "eq", "BUTTON", "reset" ], ], [ "exec", "/etc/rc.button/failsafe" ] ], -- 2.30.2