From 574bab45ac550c378af1435362e0d9782147f215 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 27 Mar 2013 12:39:42 +0000 Subject: [PATCH] base-files: firstboot: only ask for confirmation on TTY Also allow '-y' to force the reset. SVN-Revision: 36133 --- package/base-files/files/sbin/firstboot | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot index e7c0851ad0..06b64c3133 100755 --- a/package/base-files/files/sbin/firstboot +++ b/package/base-files/files/sbin/firstboot @@ -21,11 +21,13 @@ if [ "${0##*/}" = "firstboot" ]; then if [ "$1" = "switch2jffs" ]; then boot_run_hook switch2jffs else - local input + if [ -t 0 ] && [ "$1" != "-y" ]; then + local input - echo -n "firstboot will erase all settings and remove any installed packages. Are you sure? [N/y]" - read input - [ "$input" = "y" ] || [ "$input" = "Y" ] || return 0 + echo -n "firstboot will erase all settings and remove any installed packages. Are you sure? [N/y]" + read input + [ "$input" = "y" ] || [ "$input" = "Y" ] || return 0 + fi if [ -n "$jffs" ]; then reset_has_fo=true