diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-21 11:09:51 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-21 11:09:51 -0700 |
| commit | d801c05f63b0b16f485b176db64e3147ad7d3086 (patch) | |
| tree | 9829f0bf340a55986aa6d11f1b1d8d5334306abd /templates/interfaces/pseudo-ethernet | |
| parent | 6d59b5077ef1834379a950437b01d15d687c7a53 (diff) | |
| parent | 7369bf61abd3eed1fdd17a56908cf2c0ffc9843f (diff) | |
| download | vyatta-cfg-system-d801c05f63b0b16f485b176db64e3147ad7d3086.tar.gz vyatta-cfg-system-d801c05f63b0b16f485b176db64e3147ad7d3086.zip | |
Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg-system into larkspur
Diffstat (limited to 'templates/interfaces/pseudo-ethernet')
| -rw-r--r-- | templates/interfaces/pseudo-ethernet/node.def | 10 | ||||
| -rw-r--r-- | templates/interfaces/pseudo-ethernet/node.tag/disable/node.def | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def index cdbff5c8..bf88b047 100644 --- a/templates/interfaces/pseudo-ethernet/node.def +++ b/templates/interfaces/pseudo-ethernet/node.def @@ -1,13 +1,13 @@ tag: priority: 390 type: txt -help: Set Virtual Ethernet device +help: Set Pseudo Ethernet device name +comp_help: Enter Pseudo Ethernet interface name (peth0 - peth999) syntax:expression: pattern $VAR(@) "^peth[0-9]+$" \ ; "name must be (peth0-peth999)" commit:expression: $VAR(link) != "" ; "link device must be set for virtual ethernet $VAR(@)" -create: sudo ip link add $VAR(@) link $VAR(link/@) type macvlan || exit 1 - sudo ip link set $VAR(@) up +create: ip link add $VAR(@) link $VAR(link/@) type macvlan || exit 1 + ip link set $VAR(@) up /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on -delete: sudo ip link delete dev $VAR(@) type macvlan -comp_help: Enter virtual ethernet interface name (peth0 - peth999) +delete: ip link delete dev $VAR(@) type macvlan diff --git a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def index 3d3ffef9..9dafeacf 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def @@ -5,12 +5,12 @@ create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all` exit 1 fi /etc/netplug/linkdown.d/dhclient $VAR(../@) - if ! sudo ip link set $VAR(../@) down 2>/dev/null; then + if ! ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" /etc/netplug/linkup.d/dhclient $VAR(../@) exit 1 fi -delete: if ! sudo ip link set $VAR(../@) up; then +delete: if ! ip link set $VAR(../@) up; then echo "Error enabling dev $VAR(../@)" exit 1 fi |