From: Chris Blake Date: Mon, 24 Oct 2016 18:13:15 +0000 (-0500) Subject: base-files: Ensure reset only works if an overlay exists X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b745bfa6dcba4fb6d67e6893bc8e706ec2e687c3;p=openwrt%2Fstaging%2Fadrian.git base-files: Ensure reset only works if an overlay exists Currently the reset script will try to run jffs2reset on boards that are running a rw rootfs, such as ext4. This will cause jffs2reset to fail and the board to never reboot while the LED blinks until a manual reboot. This commit does two different things: 1. Disables reset on boards that do not have an overlay mount 2. Disables the Blinking LED after 5 seconds if the board does not support reset Signed-off-by: Chris Blake --- diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset index c6dc7cfbc0..4265767437 100755 --- a/package/base-files/files/etc/rc.button/reset +++ b/package/base-files/files/etc/rc.button/reset @@ -2,8 +2,12 @@ . /lib/functions.sh +OVERLAY="$( grep ' /overlay ' /proc/mounts )" + case "$ACTION" in pressed) + [ -z "$OVERLAY" ] && return 0 + return 5 ;; timeout) @@ -16,7 +20,7 @@ released) echo "REBOOT" > /dev/console sync reboot - elif [ "$SEEN" -gt 5 ] + elif [ "$SEEN" -gt 5 -a -n "$OVERLAY" ] then echo "FACTORY RESET" > /dev/console jffs2reset -y && reboot &