diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2012-07-02 03:51:01 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2012-07-02 04:00:16 -0600 |
| commit | e0a45ce03c033d40afbcd9a64b16dc686a000465 (patch) | |
| tree | dc15160203b2ec244342f17c927e8ad2b1b0f647 /etc/inc/util.inc | |
| parent | 58d609d42024af9845b73d63c8c3fe28c5ba4e18 (diff) | |
| download | pfsense-e0a45ce03c033d40afbcd9a64b16dc686a000465.zip pfsense-e0a45ce03c033d40afbcd9a64b16dc686a000465.tar.gz | |
Do not directly print out a message when checking the interfaces, instead saving the list to use later. Display this list before the interface mismatch message. Fixes #2468 and fixes #2531
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index ccd8e58..cb1ac42 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1473,6 +1473,7 @@ function is_interface_mismatch() { $do_assign = false; $i = 0; + $missing_interfaces = array(); if (is_array($config['interfaces'])) { foreach ($config['interfaces'] as $ifname => $ifcfg) { if (preg_match("/^enc|^cua|^tun|^tap|^l2tp|^pptp|^ppp|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) { @@ -1481,7 +1482,7 @@ function is_interface_mismatch() { continue; } else if (does_interface_exist($ifcfg['if']) == false) { - echo "Warning: Interface '{$ifcfg['if']}' does not exist.\n"; + $missing_interfaces[] = $ifcfg['if']; $do_assign = true; } else $i++; @@ -1491,7 +1492,12 @@ function is_interface_mismatch() { if ($g['minimum_nic_count'] > $i) { $do_assign = true; } else if (file_exists("{$g['tmp_path']}/assign_complete")) - $do_assign = false; + $do_assign = false; + + if (!empty($missing_interfaces) && $do_assign) + file_put_contents("{$g['tmp_path']}/missing_interfaces", implode(' ', $missing_interfaces)); + else + @unlink("{$g['tmp_path']}/missing_interfaces"); return $do_assign; } |
