Commit 16adc594 authored by Franco Fichtner's avatar Franco Fichtner

rc: starting importer directly needs no timeout

parent fedfd0a4
...@@ -63,13 +63,6 @@ bootstrap_and_exit() ...@@ -63,13 +63,6 @@ bootstrap_and_exit()
exit 0 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() timeout_prompt()
{ {
OUTPUT=$(echo ${2} | sed 's/./& /g') OUTPUT=$(echo ${2} | sed 's/./& /g')
...@@ -93,8 +86,16 @@ timeout_prompt() ...@@ -93,8 +86,16 @@ timeout_prompt()
return ${RETURN} return ${RETURN}
} }
if ! timeout_prompt 'Press any key to start the configuration importer:' .......; then if [ -n "${DO_BOOT}" ]; then
bootstrap_and_exit 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 fi
DEVS=$(camcontrol devlist) DEVS=$(camcontrol devlist)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment