rc: fix importer issue with empty prompt

This commit is contained in:
Franco Fichtner 2017-03-17 19:15:42 +01:00
parent ea0eeadf15
commit b595a3e2e9

View File

@ -110,21 +110,22 @@ probe_for_part()
DEVS=
PART=
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
elif [ -n "${1}" ]; then
if [ -n "${1}" ]; then
if ! probe_for_part ${1}; then
bootstrap_and_exit
fi
else
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)
fi