Set standalone to load Xwindows

This commit is contained in:
Mike Reeves
2022-03-29 17:28:32 -04:00
parent 67582be575
commit 45161b2a39
2 changed files with 6 additions and 8 deletions

View File

@@ -169,13 +169,6 @@ calculate_useable_cores() {
export lb_procs export lb_procs
} }
catch() {
info "Fatal error occurred at $1 in so-setup, failing setup."
grep --color=never "ERROR" "$setup_log" > "$error_log"
whiptail_setup_failed
exit 1
}
check_admin_pass() { check_admin_pass() {
check_pass_match "$ADMINPASS1" "$ADMINPASS2" "APMATCH" check_pass_match "$ADMINPASS1" "$ADMINPASS2" "APMATCH"
} }

View File

@@ -135,7 +135,12 @@ fi
# Set up handler for setup to exit early (use `kill -SIGUSR1 "$setup_proc"; exit 1` in child scripts) # Set up handler for setup to exit early (use `kill -SIGUSR1 "$setup_proc"; exit 1` in child scripts)
trap 'catch $LINENO' SIGUSR1 trap 'catch $LINENO' SIGUSR1
setup_proc="$$" setup_proc="$$"
catch catch() {
info "Fatal error occurred at $1 in so-setup, failing setup."
grep --color=never "ERROR" "$setup_log" > "$error_log"
whiptail_setup_failed
exit 1
}
automated=no automated=no
progress progress