Make dying on config pregen more explicit

This commit is contained in:
Salt 2020-05-15 03:27:21 -05:00
parent 0637e910aa
commit 26fffb92f0

View File

@ -571,7 +571,10 @@ main() {
# Early hook for help # Early hook for help
[ -n "$_opthelp" ] && printhelp && exit 0 [ -n "$_opthelp" ] && printhelp && exit 0
# Early hook for generating configs # Early hook for generating configs
[ -n "$_optpregen" ] && genconfigs && exit $? if [ -n "$_optpregen" ]; then
genconfigs
exit $?
fi
# Ensure our running environment is sane and that we're not about to nest # Ensure our running environment is sane and that we're not about to nest
if [ -z "$_optdryrun" ] && [ -z "$_optpregen" ]; then if [ -z "$_optdryrun" ] && [ -z "$_optpregen" ]; then
for pid in $(pgrep firestarter); do for pid in $(pgrep firestarter); do