lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: starting importer directly needs no timeout

Browse Source
This commit is contained in:
Franco Fichtner 2017-03-01 06:40:12 +01:00
parent fedfd0a4a8
commit 16adc594c6
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/etc/rc.importer
View File

@ -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)