Merge remote-tracking branch 'remotes/origin/dev' into issue/3264

This commit is contained in:
m0duspwnens
2021-05-03 11:49:09 -04:00

View File

@@ -291,7 +291,7 @@ if ! [[ -f $install_opt_file ]]; then
collect_hostname collect_hostname
fi fi
whiptail_node_description [[ ! ( $is_eval || $is_import ) ]] && whiptail_node_description
if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
network_init_whiptail network_init_whiptail
@@ -961,4 +961,4 @@ fi
install_cleanup >> "$setup_log" 2>&1 install_cleanup >> "$setup_log" 2>&1
if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi