Skip to content

O
OpnSense
Commit b595a3e2 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

rc: fix importer issue with empty prompt

parent ea0eeadf
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
src/etc/rc.importer
View file @ b595a3e2
...@@ -110,7 +110,12 @@ probe_for_part() ...@@ -110,7 +110,12 @@ probe_for_part()
DEVS= DEVS=
PART= PART=
if [ -n "${DO_BOOT}" ]; 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 touch ${INSTALL} 2> /dev/null
if [ -f ${INSTALL} -a -f /conf/config.xml ]; then if [ -f ${INSTALL} -a -f /conf/config.xml ]; then
bootstrap_and_exit bootstrap_and_exit
...@@ -120,11 +125,7 @@ if [ -n "${DO_BOOT}" ]; then ...@@ -120,11 +125,7 @@ if [ -n "${DO_BOOT}" ]; then
'Press any key to start the configuration importer:' .......; then 'Press any key to start the configuration importer:' .......; then
bootstrap_and_exit bootstrap_and_exit
fi fi
elif [ -n "${1}" ]; then
if ! probe_for_part ${1}; then
bootstrap_and_exit
fi fi
else
DEVS=$(camcontrol devlist) DEVS=$(camcontrol devlist)
fi fi
......
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

Technounit-GROUP 2023