From 3b714db0bfcbfdde05c95e5aa2778338a422ae1b Mon Sep 17 00:00:00 2001
From: Mike Reeves <reevesmk@gmail.com>
Date: Tue, 5 May 2026 15:22:40 -0400
Subject: [PATCH] Show management bond option consistently

---
 setup/so-functions | 12 +++++++++++-
 setup/so-setup     | 10 ++++++++++
 setup/so-whiptail  |  4 +---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 4d60963c5..571270227 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1443,7 +1443,7 @@ network_init() {
 	title "Initializing Network"
 	disable_ipv6
 	set_hostname
-	if [[ ( $is_iso || $is_desktop_iso ) ]]; then
+	if [[ $is_iso || $is_desktop_iso || $MNIC == "bond1" ]]; then
 		set_management_interface
 	fi
 }
@@ -1465,6 +1465,16 @@ network_init_whiptail() {
 			whiptail_network_notice
 			whiptail_dhcp_warn
 			whiptail_management_nic
+			if [[ $MNIC == "bond1" ]]; then
+				whiptail_dhcp_or_static
+
+				if [ "$address_type" != 'DHCP' ]; then
+					collect_int_ip_mask
+					collect_gateway
+					collect_dns
+					collect_dns_domain
+				fi
+			fi
 			;;
 	esac
 }
diff --git a/setup/so-setup b/setup/so-setup
index 7875b9c99..27aeef1f6 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -292,6 +292,16 @@ if ! [[ -f $install_opt_file ]]; then
 			# Warn about the dangers of DHCP
 			whiptail_dhcp_warn
 			whiptail_management_nic
+			if [[ $MNIC == "bond1" ]]; then
+				whiptail_dhcp_or_static
+
+				if [ "$address_type" != 'DHCP' ]; then
+					collect_int_ip_mask
+					collect_gateway
+					collect_dns
+					collect_dns_domain
+				fi
+			fi
 		fi
 		# Initializing the network based on the previous information
 		network_init
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 6188d3d30..a0c9d797b 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -846,9 +846,7 @@ whiptail_management_nic() {
 
 	filter_unused_nics
 	local management_nic_options=( "${nic_list_management[@]}" )
-	if [[ $is_iso || $is_desktop_iso ]]; then
-		management_nic_options+=( "BOND" "Configure a bonded management interface" )
-	fi
+	management_nic_options+=( "BOND" "Configure a bonded management interface" )
 
 	MNIC=$(whiptail --title "$whiptail_title" --menu "Please select the NIC you would like to use for management.\n\nUse the arrow keys to move around and the Enter key to select." 20 75 12 "${management_nic_options[@]}" 3>&1 1>&2 2>&3 )
 	local exitstatus=$?