From 16adc594c6e44bb2bbc67cc4c88d2e9d5af6a8b4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 1 Mar 2017 06:40:12 +0100
Subject: [PATCH] rc: starting importer directly needs no timeout

---
 src/etc/rc.importer | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/etc/rc.importer b/src/etc/rc.importer
index 5b2499493..222172ce7 100755
--- a/src/etc/rc.importer
+++ b/src/etc/rc.importer
@@ -63,13 +63,6 @@ bootstrap_and_exit()
 	exit 0
 }
 
-if [ -n "${DO_BOOT}" ]; then
-	touch ${INSTALL} 2> /dev/null
-	if [ -f ${INSTALL} -a -f /conf/config.xml ]; then
-		bootstrap_and_exit
-	fi
-fi
-
 timeout_prompt()
 {
 	OUTPUT=$(echo ${2} | sed 's/./& /g')
@@ -93,8 +86,16 @@ timeout_prompt()
 	return ${RETURN}
 }
 
-if ! timeout_prompt 'Press any key to start the configuration importer:' .......; then
-	bootstrap_and_exit
+if [ -n "${DO_BOOT}" ]; then
+	touch ${INSTALL} 2> /dev/null
+	if [ -f ${INSTALL} -a -f /conf/config.xml ]; then
+		bootstrap_and_exit
+	fi
+
+	if ! timeout_prompt \
+	    'Press any key to start the configuration importer:' .......; then
+		bootstrap_and_exit
+	fi
 fi
 
 DEVS=$(camcontrol devlist)