From 64bb5ab8e112266f1f3257a11b84fad4e1d1d331 Mon Sep 17 00:00:00 2001 From: digimer Date: Sun, 15 Jan 2023 01:41:55 -0500 Subject: [PATCH] * Updated striker to only complain about unconfigured networks on nodes, not DR hosts. * Updated anvil-configure-host to ignore gracefully unconfigured networks. Signed-off-by: digimer --- cgi-bin/striker | 2 +- tools/anvil-configure-host | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cgi-bin/striker b/cgi-bin/striker index c06c9f5b..b862492f 100755 --- a/cgi-bin/striker +++ b/cgi-bin/striker @@ -5825,7 +5825,7 @@ sub process_prep_network if ((not $anvil->data->{cgi}{$link1_key}{value}) && (not $anvil->data->{cgi}{$link2_key}{value})) { # If this is network 1, both are required. - if ($i == 1) + if (($host_type eq "node") && ($i == 1)) { # Required. my $error_message = $anvil->Words->string({key => "warning_0021"}); diff --git a/tools/anvil-configure-host b/tools/anvil-configure-host index 0a2cc731..ed03a1fb 100755 --- a/tools/anvil-configure-host +++ b/tools/anvil-configure-host @@ -406,6 +406,9 @@ ORDER BY 's2:variable_name' => $variable_name, 's3:variable_value' => $variable_value, }}); + + # An undefined interface will have the MAC address value set to '1', ignore those. + next if $variable_value = 1; if ($variable_name =~ /form::config_step2::(.*?)_mac_to_set::value/) {