Remove the minimum NIC warning, this dates back to when minimum 2 NICs were supported and it made sense to throw this message at people. It's obvious a network appliance requires at least one NIC.

This commit is contained in:
Chris Buechler 2014-10-07 23:33:55 -05:00
parent b4bd9c56c1
commit bd0b5d2dc7
3 changed files with 4 additions and 18 deletions

View File

@ -191,13 +191,6 @@ EOD;
echo <<<EOD
*NOTE* {$g['product_name']} requires {$g['minimum_nic_count_text']} assigned interface(s) to function.
If you do not have {$g['minimum_nic_count_text']} interfaces you CANNOT continue.
If you do not have at least {$g['minimum_nic_count']} *REAL* network interface card(s)
or one interface with multiple VLANs then {$g['product_name']}
*WILL NOT* function correctly.
If you do not know the names of your interfaces, you may choose to use
auto-detection. In that case, disconnect all interfaces now before
hitting 'a' to initiate auto detection.
@ -231,12 +224,8 @@ EOD;
}
if($lanif == "") {
if($g['minimum_nic_count'] < 2) {
break;
} else {
fclose($fp);
return;
}
fclose($fp);
return;
}
if ($lanif === "a")

View File

@ -77,8 +77,6 @@ $g = array(
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
"minimum_nic_count" => "1",
"minimum_nic_count_text" => "*AT LEAST* 1",
"wan_interface_name" => "wan",
"nopccard_platforms" => array("wrap", "net48xx"),
"xmlrpcbaseurl" => "https://packages.pfsense.org",

View File

@ -1710,9 +1710,8 @@ function is_interface_mismatch() {
}
}
if ($g['minimum_nic_count'] > $i) {
$do_assign = true;
} else if (file_exists("{$g['tmp_path']}/assign_complete"))
$do_assign = true;
if (file_exists("{$g['tmp_path']}/assign_complete"))
$do_assign = false;
if (!empty($missing_interfaces) && $do_assign)