From f5c88036b068261523a1b99d3b0d268a467691e9 Mon Sep 17 00:00:00 2001 From: rmilecki Date: Mon, 10 Aug 2015 23:58:15 +0000 Subject: [PATCH] buttons: make all button handler scripts return 0 this is required by the new button timeout feature Signed-off-by: John Crispin Backport of r46471 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46581 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/rc.button/failsafe | 2 ++ package/base-files/files/etc/rc.button/reset | 2 ++ package/base-files/files/etc/rc.button/rfkill | 2 ++ package/network/services/hostapd/files/wps-hotplug.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/package/base-files/files/etc/rc.button/failsafe b/package/base-files/files/etc/rc.button/failsafe index bfad810428..ba958fa885 100755 --- a/package/base-files/files/etc/rc.button/failsafe +++ b/package/base-files/files/etc/rc.button/failsafe @@ -1,3 +1,5 @@ #!/bin/sh [ "${TYPE}" = "switch" ] || echo ${BUTTON} > /tmp/failsafe_button + +return 0 diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset index 229b503a69..3e241460ef 100755 --- a/package/base-files/files/etc/rc.button/reset +++ b/package/base-files/files/etc/rc.button/reset @@ -16,3 +16,5 @@ then echo "FACTORY RESET" > /dev/console jffs2reset -y && reboot & fi + +return 0 diff --git a/package/base-files/files/etc/rc.button/rfkill b/package/base-files/files/etc/rc.button/rfkill index e8d5a9c8cb..9e2c12f8c3 100755 --- a/package/base-files/files/etc/rc.button/rfkill +++ b/package/base-files/files/etc/rc.button/rfkill @@ -28,3 +28,5 @@ esac config_foreach wifi_rfkill_set wifi-device uci commit wireless wifi up + +return 0 diff --git a/package/network/services/hostapd/files/wps-hotplug.sh b/package/network/services/hostapd/files/wps-hotplug.sh index 5b3c753427..24af80e55b 100644 --- a/package/network/services/hostapd/files/wps-hotplug.sh +++ b/package/network/services/hostapd/files/wps-hotplug.sh @@ -7,3 +7,5 @@ if [ "$ACTION" = "pressed" -a "$BUTTON" = "wps" ]; then hostapd_cli -i "$socket" wps_pbc done fi + +return 0 -- 2.11.0