entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Pass friendlyifname to handle_argument_group, not realifname. Fixes #3984. clean up some text while here.

This commit is contained in:
Chris Buechler 2014-11-05 20:45:13 -06:00
parent e55e4b748c
commit e8fa9843b5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/rc.linkup
View File

@ -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;