diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index ca0418bc..6979af0d 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -207,6 +207,7 @@ case "${CMD}" in console| \ convert| \ create| \ + destroy| \ edit| \ etcupdate| \ export| \ @@ -214,7 +215,9 @@ case "${CMD}" in import| \ limits| \ list| \ + migrate| \ network| \ + pkg| \ rcp| \ rdr| \ rename| \ @@ -231,12 +234,9 @@ case "${CMD}" in # Commands that allow parallel mode config| \ cp| \ - destroy| \ jcp| \ limits| \ - migrate| \ mount| \ - pkg| \ restart| \ start| \ stop| \ diff --git a/usr/local/share/bastille/destroy.sh b/usr/local/share/bastille/destroy.sh index 4403442d..56081e10 100644 --- a/usr/local/share/bastille/destroy.sh +++ b/usr/local/share/bastille/destroy.sh @@ -334,17 +334,7 @@ case "${TARGET}" in # Destroy targeted jail(s) set_target "${TARGET}" "reverse" for _jail in ${JAILS}; do - if [ "${AUTO_YES}" -eq 1 ]; then - ( - destroy_jail "${_jail}" - ) & - else - ( - destroy_jail "${_jail}" - ) - fi - bastille_running_jobs "${bastille_process_limit}" + destroy_jail "${_jail}" done - wait ;; esac diff --git a/usr/local/share/bastille/migrate.sh b/usr/local/share/bastille/migrate.sh index fb23b54c..eacaa753 100644 --- a/usr/local/share/bastille/migrate.sh +++ b/usr/local/share/bastille/migrate.sh @@ -348,8 +348,6 @@ validate_host_status "${USER}" "${HOST}" "${PORT}" for _jail in ${JAILS}; do - ( - # Validate jail state if [ "${LIVE}" -eq 1 ]; then if ! check_target_is_running "${_jail}"; then @@ -371,9 +369,5 @@ for _jail in ${JAILS}; do info "\nSuccessfully migrated '${_jail}' to '${HOST}'.\n" - ) & - - bastille_running_jobs "${bastille_process_limit}" - done -wait +echo diff --git a/usr/local/share/bastille/pkg.sh b/usr/local/share/bastille/pkg.sh index 1d79b491..677b4f4a 100644 --- a/usr/local/share/bastille/pkg.sh +++ b/usr/local/share/bastille/pkg.sh @@ -140,29 +140,8 @@ pkg_run_command() { } for _jail in ${JAILS}; do - - if [ "${AUTO_YES}" -eq 1 ]; then - - ( - - pkg_run_command "$@" - - ) & - - else - - ( - - pkg_run_command "$@" - - ) - - fi - - bastille_running_jobs "${bastille_process_limit}" - + pkg_run_command "$@" done -wait echo bastille_return_exit_code