Do not ignore interface events even for pppoe/pptp it does no good.

1 files changed, 13 insertions, 14 deletions

diff --git a/etc/rc.linkup b/etc/rc.linkup
index fc7c0a6..38c9164 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -34,29 +34,28 @@ require_once("globals.inc");
 require_once("config.inc");
 require_once("functions.inc");
 
-function handle_argument_group($argument1, $argument2) {
+function handle_argument_group($iface, $argument2) {
 	global $config;	
 
-	$ipaddr = $config['interfaces'][$argument1]['ipaddr'];
+	$ipaddr = $config['interfaces'][$iface]['ipaddr'];
 	if (is_ipaddr($ipaddr)) {
-		log_error("Hotplug event detected for {$argument1} but ignoring since interface is configured with static ip({$ipaddr})");
-		exec("/usr/sbin/arp -d -i {$argument1} -a");
+		log_error("Hotplug event detected for {$iface} but ignoring since interface is configured with static ip({$ipaddr})");
+		$iface = get_real_interface($iface);
+		exec("/usr/sbin/arp -d -i {$iface} -a");
 	} else {
 		switch ($argument2) {
 		case "stop":
 		case "down":
-			log_error("DEVD Ethernet detached event for {$argument1}");
-			if ($ipaddr <> "pppoe" || $ipaddr <> "pptp")
-				interface_bring_down($iface);
-			exit; 
-			break; /* LINT - NOTREACHED */ 
+			log_error("DEVD Ethernet detached event for {$iface}");
+			interface_bring_down($iface);
+			break;
 		case "start":
 		case "up":
-			log_error("DEVD Ethernet attached event for {$argument1}");
-			exec("/usr/sbin/arp -d -i {$argument1} -a");
-			log_error("HOTPLUG: Configuring interface {$argument1}");
-			if ($ipaddr <> "pppoe" || $ipaddr <> "pptp")
-				interface_configure($iface);
+			log_error("DEVD Ethernet attached event for {$iface}");
+			$riface = get_real_interface($iface);
+			exec("/usr/sbin/arp -d -i {$riface} -a");
+			log_error("HOTPLUG: Configuring interface {$iface}");
+			interface_configure($iface);
 			break;
 		}
 	}