diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-11-05 20:45:13 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-11-05 20:45:13 -0600 |
commit | e8fa9843b591565630e4233b1ae9f305d3e29224 (patch) | |
tree | de9276e2716a4607f301aaeb0c3c6c21cb90f6a5 /etc | |
parent | e55e4b748c7396ab74e93e14fe8d8887fdb43784 (diff) | |
download | pfsense-e8fa9843b591565630e4233b1ae9f305d3e29224.zip pfsense-e8fa9843b591565630e4233b1ae9f305d3e29224.tar.gz |
Pass friendlyifname to handle_argument_group, not realifname. Fixes #3984. clean up some text while here.
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.linkup | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/rc.linkup b/etc/rc.linkup index bff0c55..5efa725 100755 --- a/etc/rc.linkup +++ b/etc/rc.linkup @@ -39,8 +39,10 @@ require_once("interfaces.inc"); function handle_argument_group($iface, $argument2) { global $config; - if (!is_array($config['interfaces'][$iface])) + if (!is_array($config['interfaces'][$iface])) { + log_error("Cannot find interface configuration for {$iface}"); return; + } $ipaddr = $config['interfaces'][$iface]['ipaddr']; $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; @@ -87,10 +89,10 @@ global $g; if (!file_exists("{$g['varrun_path']}/booting") && empty($g['booting'])) { if (isset($_GET['interface'])) { if (!empty($_GET['interface'])) - handle_argument_group($_GET['interface'], $_GET['action']); + handle_argument_group(convert_real_interface_to_friendly_interface_name($_GET['interface']), $_GET['action']); } else { if ($argc < 3) { - log_error("HOTPLUG event: The number of required parameters not passed!"); + log_error("HOTPLUG event: The required number of parameters not passed!"); exit; } $action = $argv[1]; @@ -99,7 +101,7 @@ if (isset($_GET['interface'])) { case "stop": break; default: - log_error("HOTPLUG event: The action parameter passed is wrong($action) only start/stop/up/down are allowed!"); + log_error("HOTPLUG event: Action parameter ($action) passed is wrong - only start/stop/up/down are allowed!"); exit; /* NOTREACHED */ break; |