CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10799 from Security-Onion-Solutions/2.4/mysql

Browse Source 
whiptails for ubuntu focal
This commit is contained in:
Josh Patterson
2023-07-19 15:55:32 -04:00
committed by GitHub
parent c8b65ecca0 19c6796927
commit 066de70638
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
setup/so-whiptail
View File

@@ -545,7 +545,7 @@ whiptail_install_type() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
# What kind of install are we doing? # What kind of install are we doing?
# if [[ $is_rocky || $is_centos ]]; then if [[ "$OSVER" != "focal" ]]; then
install_type=$(whiptail --title "$whiptail_title" --menu \ install_type=$(whiptail --title "$whiptail_title" --menu \
"What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \
"IMPORT" "Import PCAP or log files " \ "IMPORT" "Import PCAP or log files " \
@@ -555,14 +555,13 @@ whiptail_install_type() {
"OTHER" "Other install types" \ "OTHER" "Other install types" \
3>&1 1>&2 2>&3 3>&1 1>&2 2>&3
) )
# elif [[ $is_ubuntu ]]; then elif [[ "$OSVER" == "focal" ]]; then
# install_type=$(whiptail --title "$whiptail_title" --menu \ install_type=$(whiptail --title "$whiptail_title" --menu \
# "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \
# "DISTRIBUTED" "Distributed install submenu " \ "DISTRIBUTED" "Distributed install submenu " \
# "OTHER" "Other install types" \ 3>&1 1>&2 2>&3
# 3>&1 1>&2 2>&3 )
# ) fi
# fi
local exitstatus=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
@@ -585,18 +584,18 @@ whiptail_install_type_dist() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
# if [[ $is_rocky || $is_centos ]]; then if [[ "$OSVER" != "focal" ]]; then
dist_option=$(whiptail --title "$whiptail_title" --menu "Do you want to start a new deployment or join this box to \nan existing deployment?" 11 75 2 \ dist_option=$(whiptail --title "$whiptail_title" --menu "Do you want to start a new deployment or join this box to \nan existing deployment?" 11 75 2 \
"New Deployment " "Create a new Security Onion deployment" \ "New Deployment " "Create a new Security Onion deployment" \
"Existing Deployment " "Join to an existing Security Onion deployment " \ "Existing Deployment " "Join to an existing Security Onion deployment " \
3>&1 1>&2 2>&3 3>&1 1>&2 2>&3
) )
# elif [[ $is_ubuntu ]]; then elif [[ "$OSVER" == "focal" ]]; then
# dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \ dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \
# "Existing Deployment " "Join to an existing Security Onion deployment " \ "Existing Deployment " "Join to an existing Security Onion deployment " \
# 3>&1 1>&2 2>&3 3>&1 1>&2 2>&3
# ) )
# fi fi
local exitstatus=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus