T797: add sudo to ip command calls in other interface types.

13 files changed, 29 insertions, 29 deletions

diff --git a/templates/interfaces/bonding/node.def b/templates/interfaces/bonding/node.def
index 2346c490..d87d5b98 100644
--- a/templates/interfaces/bonding/node.def
+++ b/templates/interfaces/bonding/node.def
@@ -24,6 +24,6 @@ delete: SLAVES=`cat /sys/class/net/$VAR(@)/bonding/slaves`;
 
 end: if [ -f /tmp/bonding_$VAR(@).$PPID ]
      then rm -f /tmp/bonding_$VAR(@).$PPID
-	  ip link set "$VAR(@)" up
+	  sudo ip link set "$VAR(@)" up
 	  /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on
      fi
diff --git a/templates/interfaces/bonding/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/disable/node.def
index 6e684ebd..c4a4c681 100644
--- a/templates/interfaces/bonding/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/disable/node.def
@@ -1,11 +1,11 @@
 help: Disable interface
 create: /etc/netplug/linkdown.d/dhclient $VAR(../@)
-        if ! ip link set $VAR(../@) down 2>/dev/null; then
+        if ! sudo 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 ! ip link set $VAR(../@) up; then
+delete: if ! sudo ip link set $VAR(../@) up; then
           echo "Error enabling dev $VAR(../@)"
           exit 1
         fi
diff --git a/templates/interfaces/bonding/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/mtu/node.def
index 1a8011b4..71347c58 100644
--- a/templates/interfaces/bonding/node.tag/mtu/node.def
+++ b/templates/interfaces/bonding/node.tag/mtu/node.def
@@ -3,5 +3,5 @@ priority: 381
 help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
 val_help: u32:68-9000; Maximum Transmission Unit
-update: ip link set $VAR(../@) mtu $VAR(@)
-delete: ip link set $VAR(../@) mtu 1500
+update: sudo ip link set $VAR(../@) mtu $VAR(@)
+delete: sudo ip link set $VAR(../@) mtu 1500
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.def
index fd490689..2c483317 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.def
@@ -9,13 +9,13 @@ create: ETHERTYPE=`echo "$VAR(ethertype/@)"`
         if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
         if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
 
-        if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@)
+        if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@)
 	then echo "Error creating VLAN device $VAR(../@).$VAR(@)"
 	     exit 1
         fi
 	# if parent is up, then bring VLAN up
 	if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ]
-        then ip link set "$VAR(../@).$VAR(@)" up
+        then sudo ip link set "$VAR(../@).$VAR(@)" up
 	fi
 	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
 
@@ -23,4 +23,4 @@ delete: ETHERTYPE=`echo "$VAR(ethertype/@)"`
 	if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
 	if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
 	[ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0
-	ip link delete dev "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@)
+	sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@)
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def
index e9943645..12db6a98 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def
@@ -1,11 +1,11 @@
 help: Disable interface
 update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@)
-        if ! ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
+        if ! sudo ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../../@).$VAR(../@)"
           /etc/netplug/linkup.d/dhclient $VAR(../../@).$VAR(../@)
           exit 1
         fi
-delete: if ! ip link set $VAR(../../@).$VAR(../@) up; then
+delete: if ! sudo ip link set $VAR(../../@).$VAR(../@) up; then
           echo "Error enabling dev $VAR(../../@).$VAR(../@)"
           exit 1
         fi
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def
index a79acae4..24d08568 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def
@@ -20,7 +20,7 @@ update: ACTIVEETHTYPE=`cli-shell-api returnActiveValue interfaces bonding $VAR(.
 		echo "Must configure slave devices for bond interface $VAR(../@) before adding vif"
 		exit 1
 	fi
-	ip link delete dev "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) > /dev/null 2>&1
-	ip link add link $VAR(../../@) name "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) || exit 1
-	ip link set "$VAR(../../@).$VAR(../@)" up
+	sudo ip link delete dev "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) > /dev/null 2>&1
+	sudo ip link add link $VAR(../../@) name "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) || exit 1
+	sudo ip link set "$VAR(../../@).$VAR(../@)" up
 	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def
index d6151dcb..b3f3e7c7 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def
@@ -4,6 +4,6 @@ help: Maximum Transmission Unit (MTU)
 val_help: u32:68-9000; Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
 
-update: ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@)
+update: sudo ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@)
 delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@) ] || exit 0
-        ip link set $VAR(../../@).$VAR(../@) mtu 1500
+        sudo ip link set $VAR(../../@).$VAR(../@) mtu 1500
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def
index 77c6e56b..eb32ce61 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def
@@ -10,9 +10,9 @@ create: read -a SLAVES </sys/class/net/$VAR(../../@)/bonding/slaves
 	    echo "Must configure slave devices for bond interface $VAR(../../@) before adding vif"
 	    exit 1
    	fi
-	ip link add link $VAR(../../@).$VAR(../@) name "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@) || exit 1
-        ip link set "$VAR(../../@).$VAR(../@).$VAR(@)" up
+	sudo ip link add link $VAR(../../@).$VAR(../@) name "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@) || exit 1
+        sudo ip link set "$VAR(../../@).$VAR(../@).$VAR(@)" up
 	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@).$VAR(@)" on
 
 delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@).$VAR(@) ] || exit 0
-	ip link delete dev "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@)
+	sudo ip link delete dev "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@)
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def
index 31c5a9b2..7069e9c9 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def
@@ -1,11 +1,11 @@
 help: Disable interface
 update: /etc/netplug/linkdown.d/dhclient $VAR(../../../@).$VAR(../../@).$VAR(../@)
-        if ! ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) down 2>/dev/null; then
+        if ! sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../../../@).$VAR(../../@).$VAR(../@)"
           /etc/netplug/linkup.d/dhclient $VAR(../../../@).$VAR(../../@).$VAR(../@)
           exit 1
         fi
-delete: if ! ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) up; then
+delete: if ! sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) up; then
           echo "Error enabling dev $VAR(../../../@).$VAR(../../@).$VAR(../@)"
           exit 1
         fi
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def
index ca8795ee..264c429b 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def
@@ -4,6 +4,6 @@ help: Maximum Transmission Unit (MTU)
 val_help: u32:68-9000; Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
 
-update: ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu $VAR(@)
+update: sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu $VAR(@)
 delete: [ -d /sys/class/net/$VAR(../../../@).$VAR(../../@).$VAR(../@) ] || exit 0
-        ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu 1500
+        sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu 1500
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def
index 63394e44..e7262d63 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.def
@@ -10,9 +10,9 @@ create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves
 	    echo "Must configure slave devices for bond interface $VAR(../@) before adding vif"
 	    exit 1
    	fi
-	ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
-        ip link set "$VAR(../@).$VAR(@)" up
+	sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
+        sudo ip link set "$VAR(../@).$VAR(@)" up
 	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
 
 delete: [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0
-	ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
+	sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def
index e9943645..12db6a98 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def
@@ -1,11 +1,11 @@
 help: Disable interface
 update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@)
-        if ! ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
+        if ! sudo ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../../@).$VAR(../@)"
           /etc/netplug/linkup.d/dhclient $VAR(../../@).$VAR(../@)
           exit 1
         fi
-delete: if ! ip link set $VAR(../../@).$VAR(../@) up; then
+delete: if ! sudo ip link set $VAR(../../@).$VAR(../@) up; then
           echo "Error enabling dev $VAR(../../@).$VAR(../@)"
           exit 1
         fi
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def
index d6151dcb..b3f3e7c7 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def
@@ -4,6 +4,6 @@ help: Maximum Transmission Unit (MTU)
 val_help: u32:68-9000; Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
 
-update: ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@)
+update: sudo ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@)
 delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@) ] || exit 0
-        ip link set $VAR(../../@).$VAR(../@) mtu 1500
+        sudo ip link set $VAR(../../@).$VAR(../@) mtu 1500