Browse Source

base-files: firstboot: only ask for confirmation on TTY

Also allow '-y' to force the reset.

SVN-Revision: 36133
Jonas Gorski 12 years ago
parent
commit
574bab45ac
1 changed files with 6 additions and 4 deletions
  1. 6 4
      package/base-files/files/sbin/firstboot

+ 6 - 4
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