summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/vyatta-interfaces.pl2
-rw-r--r--templates/interfaces/ethernet/node.def2
2 files changed, 1 insertions, 3 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index 310ee0e..dd71d7a 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -37,8 +37,6 @@ use VyattaMisc;
use Getopt::Long;
use POSIX;
use NetAddr::IP;
-use Tie::File;
-use Fcntl qw (:flock);
use strict;
use warnings;
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 4c311fc..1049f3e 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -11,7 +11,7 @@ update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"
-c \"link-detect\"; "
delete:expression: "sudo ip link set $VAR(@) down" ; "Error disabling dev $VAR(@)"
allowed: for dev in /sys/class/net/*;
- do if [[ -L $dev/device ]]
+ do if [[ -d $dev && -L $dev/device ]]
then if [[ $(cat $dev/type) -eq 1 ]]
then echo -n ${dev##*/} " "
fi