Projet

Général

Profil

« Précédent | Suivant » 

Révision bd0b5d2d

Ajouté par Chris Buechler il y a plus de 9 ans

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.

Voir les différences:

etc/inc/config.console.inc
191 191
	
192 192
		echo <<<EOD
193 193
	
194
*NOTE*  {$g['product_name']} requires {$g['minimum_nic_count_text']} assigned interface(s) to function.
195
        If you do not have {$g['minimum_nic_count_text']} interfaces you CANNOT continue. 
196

  
197
        If you do not have at least {$g['minimum_nic_count']} *REAL* network interface card(s)
198
        or one interface with multiple VLANs then {$g['product_name']}
199
        *WILL NOT* function correctly.
200

  
201 194
If you do not know the names of your interfaces, you may choose to use
202 195
auto-detection. In that case, disconnect all interfaces now before
203 196
hitting 'a' to initiate auto detection.
......
231 224
			}
232 225
			
233 226
			if($lanif == "") {
234
				if($g['minimum_nic_count'] < 2) {
235
					break;	
236
				} else {
237
					fclose($fp);
238
					return;
239
				}
227
				fclose($fp);
228
				return;
240 229
			}
241 230
	
242 231
			if ($lanif === "a")
etc/inc/globals.inc
77 77
	"nopkg_platforms" => array("cdrom"),
78 78
	"minimum_ram_warning" => "101",
79 79
	"minimum_ram_warning_text" => "128 MB",
80
	"minimum_nic_count" => "1",
81
	"minimum_nic_count_text" => "*AT LEAST* 1",	
82 80
	"wan_interface_name" => "wan", 
83 81
	"nopccard_platforms" => array("wrap", "net48xx"),
84 82
	"xmlrpcbaseurl" => "https://packages.pfsense.org",
etc/inc/util.inc
1710 1710
		}
1711 1711
	}
1712 1712

  
1713
	if ($g['minimum_nic_count'] > $i) {
1714
		$do_assign = true;
1715
	} else if (file_exists("{$g['tmp_path']}/assign_complete"))
1713
	$do_assign = true;
1714
	if (file_exists("{$g['tmp_path']}/assign_complete"))
1716 1715
		$do_assign = false;
1717 1716

  
1718 1717
	if (!empty($missing_interfaces) && $do_assign)

Formats disponibles : Unified diff