Abort the Fuel installation if the fuelmenu fails
Deployment of Fuel Master should halt immediately if fuelmenu fails to make it simpler to understand the reason of failure. Change-Id: I4a9b712c8fdf9cccb87a02500cdbf43793a63bf8 Closes-Bug: #1569014 Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
parent
e124d5fe53
commit
603cff3dfa
|
@ -339,14 +339,14 @@ if (virt-what | fgrep -q "virtualbox") ; then
|
|||
done
|
||||
fi
|
||||
|
||||
fuelmenu --save-only --iface=$ADMIN_INTERFACE
|
||||
fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
|
||||
set +x
|
||||
echo "Done!"
|
||||
|
||||
if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
|
||||
fuelmenu
|
||||
else
|
||||
#Give user 15 seconds to enter fuelmenu or else continue
|
||||
fuelmenu || fail
|
||||
else
|
||||
# Give user 15 seconds to enter fuelmenu or else continue
|
||||
echo
|
||||
echo -n "Press a key to enter Fuel Setup (or press ESC to skip)... 15"
|
||||
countdown 15 & pid=$!
|
||||
|
@ -358,7 +358,7 @@ if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
|
|||
$'\e') echo "Skipping Fuel Setup.."
|
||||
;;
|
||||
*) echo -e "\nEntering Fuel Setup..."
|
||||
fuelmenu
|
||||
fuelmenu || fail
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue