Merge remote-tracking branch 'origin/2.4/dev' into issue/11229

This commit is contained in:
m0duspwnens
2023-09-08 15:29:04 -04:00

View File

@@ -398,20 +398,22 @@ collect_mngr_hostname() {
sed -i "/$MSRV/d" /etc/hosts sed -i "/$MSRV/d" /etc/hosts
fi fi
if ! getent hosts "$MSRV"; then if [[ -z "$MSRVIP" ]]; then
whiptail_manager_ip if ! getent hosts "$MSRV"; then
whiptail_manager_ip
while ! valid_ip4 "$MSRVIP" || [[ $MSRVIP == "$MAINIP" || $MSRVIP == "127.0.0.1" ]]; do while ! valid_ip4 "$MSRVIP" || [[ $MSRVIP == "$MAINIP" || $MSRVIP == "127.0.0.1" ]]; do
whiptail_invalid_input whiptail_invalid_input
whiptail_manager_ip "$MSRVIP"
done
else
MSRVIP=$(getent hosts "$MSRV" | awk 'NR==1{print $1}')
whiptail_manager_ip "$MSRVIP" whiptail_manager_ip "$MSRVIP"
done while ! valid_ip4 "$MSRVIP" || [[ $MSRVIP == "$MAINIP" || $MSRVIP == "127.0.0.1" ]]; do
else whiptail_invalid_input
MSRVIP=$(getent hosts "$MSRV" | awk 'NR==1{print $1}') whiptail_manager_ip "$MSRVIP"
whiptail_manager_ip "$MSRVIP" done
while ! valid_ip4 "$MSRVIP" || [[ $MSRVIP == "$MAINIP" || $MSRVIP == "127.0.0.1" ]]; do fi
whiptail_invalid_input
whiptail_manager_ip "$MSRVIP"
done
fi fi
} }