Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-system into jenner

15 files changed, 122 insertions, 113 deletions

diff --git a/templates/interfaces/bonding/node.def b/templates/interfaces/bonding/node.def
index be8baaee..53800dba 100644
--- a/templates/interfaces/bonding/node.def
+++ b/templates/interfaces/bonding/node.def
@@ -10,7 +10,7 @@ create: sudo sh -c "echo +$VAR(@) > /sys/class/net/bonding_masters" || exit 1
 	sudo ip link set "$VAR(@)" up
 	/opt/vyatta/sbin/vyatta-link-detect $VAR(@) on
 delete: SLAVES=`cat /sys/class/net/$VAR(@)/bonding/slaves`;
-	if [ -z $SLAVES ]
+	if [ -z "$SLAVES" ]
 	then 
 	    sudo sh -c "echo -$VAR(@) > /sys/class/net/bonding_masters"
         else 
diff --git a/templates/interfaces/bonding/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/description/node.def
index d7becd13..1fcca391 100644
--- a/templates/interfaces/bonding/node.tag/description/node.def
+++ b/templates/interfaces/bonding/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
 help: Set description for this interface
-update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias"
+update: sudo ip li set dev $VAR(../@) alias "$VAR(@)"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/bonding/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/disable/node.def
index 3d3ffef9..ad033365 100644
--- a/templates/interfaces/bonding/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/disable/node.def
@@ -1,10 +1,5 @@
 help: Set interface disabled
-create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all`
-        if [ ! -z "$vif" ]; then
-          echo "Can not disable interface " $VAR(../@) " with vif:" $vif
-          exit 1
-        fi
-        /etc/netplug/linkdown.d/dhclient $VAR(../@)
+create: /etc/netplug/linkdown.d/dhclient $VAR(../@)
         if ! sudo ip link set $VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../@)"
           /etc/netplug/linkup.d/dhclient $VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def
index c3087022..0e292217 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.def
@@ -2,14 +2,14 @@ tag:
 type: u32
 help: Set Virtual Local Area Network (VLAN) ID
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-create: read flags < /sys/class/net/$VAR(../@)/flags
-	if [ $(( flags & 1 )) -eq 0 ]
-	then
-		echo "Can not create VLAN on disabled interface: " $VAR(../@)
-		exit 1
-	fi
-        sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
+create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves
+	if [ ${#SLAVES[*]} -eq 0 ]; then
+	    echo "Must configure slave devices for bond interface $VAR(../@) before adding vif"
+	    exit 1
+   	fi
+	sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
         sudo ip link set "$VAR(../@).$VAR(@)" up
+	sudo sh -c "/opt/vyatta/sbin/vyatta-link-detect $VAR(../@).$VAR(@) on"
 delete: sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
 comp_help: possible completions:
  <0-4094>           Set VLAN ID
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def
index 40f04bcc..26195fcc 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
 help: Set description for this interface
-update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
+update: sudo ip li set dev "$VAR(../../@).$VAR(../@)" alias "$VAR(@)"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def
index d7becd13..1fcca391 100644
--- a/templates/interfaces/bridge/node.tag/description/node.def
+++ b/templates/interfaces/bridge/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
 help: Set description for this interface
-update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias"
+update: sudo ip li set dev $VAR(../@) alias "$VAR(@)"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
index d7becd13..1fcca391 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
 help: Set description for this interface
-update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias"
+update: sudo ip li set dev $VAR(../@) alias "$VAR(@)"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/tunnel/node.tag/description/node.def b/templates/interfaces/tunnel/node.tag/description/node.def
index d7becd13..1fcca391 100644
--- a/templates/interfaces/tunnel/node.tag/description/node.def
+++ b/templates/interfaces/tunnel/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
 help: Set description for this interface
-update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/ifalias"
+update: sudo ip li set dev $VAR(../@) alias "$VAR(@)"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/zone-policy/zone/node.def b/templates/zone-policy/zone/node.def
index 1f8f2ffd..80e4f4e2 100644
--- a/templates/zone-policy/zone/node.def
+++ b/templates/zone-policy/zone/node.def
@@ -12,10 +12,16 @@ syntax:expression: pattern $VAR(@) "^[^-]" ; "Zone name cannot start with \"-\""
 
 syntax:expression: pattern $VAR(@) "^[^;]*$" ; "Zone name cannot contain ';'"
 
-create: /opt/vyatta/sbin/vyatta-zone.pl 	\
+create: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl 	\
           --action=add-zone                 	\
-          --zone-name="$VAR(@)"
+          --zone-name="$VAR(@)"; then
+          exit 1
+        fi
 
-delete: /opt/vyatta/sbin/vyatta-zone.pl 	\
+delete: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl 	\
           --action=delete-zone                 	\
-          --zone-name="$VAR(@)"
+          --zone-name="$VAR(@)"; then
+          exit 1
+        fi
diff --git a/templates/zone-policy/zone/node.tag/default-action/node.def b/templates/zone-policy/zone/node.tag/default-action/node.def
index 01714098..82a5a595 100644
--- a/templates/zone-policy/zone/node.tag/default-action/node.def
+++ b/templates/zone-policy/zone/node.tag/default-action/node.def
@@ -11,12 +11,18 @@ comp_help: possible completions:
   drop            Drop silently (default)
   reject          Drop and notify source
 
-create: /opt/vyatta/sbin/vyatta-zone.pl         \
+create: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=set-default-policy           \
           --zone-name="$VAR(../@)"              \
-          --default-policy="$VAR(@)"
+          --default-policy="$VAR(@)"; then
+          exit 1
+        fi
 
-update: /opt/vyatta/sbin/vyatta-zone.pl         \
+update: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=set-default-policy           \
           --zone-name="$VAR(../@)"              \
-          --default-policy="$VAR(@)"
+          --default-policy="$VAR(@)"; then
+	  exit 1
+	fi
diff --git a/templates/zone-policy/zone/node.tag/from/node.def b/templates/zone-policy/zone/node.tag/from/node.def
index 5e37f9f1..4b664769 100644
--- a/templates/zone-policy/zone/node.tag/from/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.def
@@ -32,6 +32,10 @@ create:
    echo Undefined from zone [$VAR(@)] under zone $parent_zone
    exit 1
  else
-   /opt/vyatta/sbin/vyatta-zone.pl --action=add-zone --zone-name="$parent_zone"
-   /opt/vyatta/sbin/vyatta-zone.pl --action=add-zone --zone-name="$VAR(@)"
+   if ! /opt/vyatta/sbin/vyatta-zone.pl --action=add-zone --zone-name="$parent_zone"; then
+     exit 1
+   fi
+   if ! /opt/vyatta/sbin/vyatta-zone.pl --action=add-zone --zone-name="$VAR(@)"; then
+     exit 1
+   fi
  fi
diff --git a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def
index e34cf8c4..b1ca94bc 100644
--- a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def
@@ -7,66 +7,58 @@ allowed:
         echo -n ${params[@]##*/}
 
 create:
-        params=( `ls /opt/vyatta/config/active/firewall/ipv6-name 2>/dev/null` )
-        array_len=${#params[*]}
-        i=0
-        found=0
-        while [ $i -lt $array_len ]; do
-             if [ \"${params[$i]}\" == \"$VAR(@)\" ] ; then
-
-                   found=1
-             fi
-             let i++
-        done
-        if [ $found -eq 0 ]; then
-           echo Invalid IPv6 firewall ruleset [$VAR(@)]
-           exit 1
-        fi
+	if  ! /opt/vyatta/sbin/vyatta-zone.pl	\
+          --action=is-fwruleset-active          \
+          --zone-name="$VAR(../../../@)"        \
+          --ruleset-type=ipv6-name		\
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+	fi
 
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+	if !  /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=add-fromzone-fw              \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=ipv6-name              \
-          --ruleset-name="$VAR(@)"
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+	fi
 
 update:
-        params=( `ls /opt/vyatta/config/active/firewall/ipv6-name 2>/dev/null` )
-        array_len=${#params[*]}
-        i=0
-        found=0
-        while [ $i -lt $array_len ]; do
-             echo comparing ${params[$i]} with $VAR(@)
-             if [ \"${params[$i]}\" == \"$VAR(@)\" ] ; then
-                   found=1
-             fi
-             let i++
-        done
-        if [ $found -eq 0 ]; then
-           echo Invalid IPv6 firewall ruleset [$VAR(@)]
-           exit 1
+        if  ! /opt/vyatta/sbin/vyatta-zone.pl   \
+          --action=is-fwruleset-active          \
+          --zone-name="$VAR(../../../@)"        \
+          --ruleset-type=ipv6-name              \
+          --ruleset-name="$VAR(@)"; then
+          exit 1
         fi
 
         # need to undo previous ruleset here first
-        old_ruleset=`cat /opt/vyatta/config/active/zone-policy/zone/$VAR(../../../@)/from/$VAR(../../@)/firewall/ipv6-name/node.val`
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+	old_ruleset=`cat /opt/vyatta/config/active/zone-policy/zone/$VAR(../../../@)/from/$VAR(../../@)/firewall/ipv6-name/node.val`
+	if !  /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=delete-fromzone-fw           \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=ipv6-name              \
-          --ruleset-name="$old_ruleset"
+          --ruleset-name="$old_ruleset"; then
+	  exit 1
+	fi
 
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+        if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=add-fromzone-fw              \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
-          --ruleset-type=ipv6-name               \
-          --ruleset-name="$VAR(@)"
+          --ruleset-type=ipv6-name		\
+          --ruleset-name="$VAR(@)"; then
+	  exit 1
+	fi
 
 delete:
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+	if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=delete-fromzone-fw           \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=ipv6-name              \
-          --ruleset-name="$VAR(@)"
+          --ruleset-name="$VAR(@)"; then
+	  exit 1
+	fi
diff --git a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def
index 56df6a19..46328f0f 100644
--- a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def
@@ -7,65 +7,59 @@ allowed:
         echo -n ${params[@]##*/}
 
 create:
-        params=( `ls /opt/vyatta/config/active/firewall/name 2>/dev/null` )
-        array_len=${#params[*]}
-        i=0
-        found=0
-        while [ $i -lt $array_len ]; do
-             if [ \"${params[$i]}\" == \"$VAR(@)\" ] ; then
-
-                   found=1
-             fi
-             let i++
-        done
-        if [ $found -eq 0 ]; then
-           echo Invalid IPv4 firewall ruleset [$VAR(@)]
-           #exit 1
-        fi
+      if  ! /opt/vyatta/sbin/vyatta-zone.pl     \
+          --action=is-fwruleset-active          \
+          --zone-name="$VAR(../../../@)"        \
+          --ruleset-type=name                   \
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+      fi
 
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+      
+      if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=add-fromzone-fw              \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=name                   \
-          --ruleset-name="$VAR(@)"
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+      fi
 
 update:
-        params=( `ls /opt/vyatta/config/active/firewall/name 2>/dev/null` )
-        array_len=${#params[*]}
-        i=0
-        found=0
-        while [ $i -lt $array_len ]; do
-             if [ \"${params[$i]}\" == \"$VAR(@)\" ] ; then
-                   found=1
-             fi
-             let i++
-        done
-        if [ $found -eq 0 ]; then
-           echo Invalid IPv4 firewall ruleset [$VAR(@)]
-           exit 1
-        fi
+      if  ! /opt/vyatta/sbin/vyatta-zone.pl     \
+          --action=is-fwruleset-active          \
+          --zone-name="$VAR(../../../@)"        \
+	  --ruleset-type=name			\
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+      fi
 
         # need to undo previous ruleset here first
 	old_ruleset=`cat /opt/vyatta/config/active/zone-policy/zone/$VAR(../../../@)/from/$VAR(../../@)/firewall/name/node.val`
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+      if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=delete-fromzone-fw           \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=name                   \
-          --ruleset-name="$old_ruleset"
+          --ruleset-name="$old_ruleset"; then
+          exit 1
+      fi
 
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+      if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=add-fromzone-fw              \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=name                   \
-          --ruleset-name="$VAR(@)"
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+      fi
 
 delete:
-        /opt/vyatta/sbin/vyatta-zone.pl         \
+      if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=delete-fromzone-fw           \
           --zone-name="$VAR(../../../@)"        \
           --from-zone="$VAR(../../@)"           \
           --ruleset-type=name                   \
-          --ruleset-name="$VAR(@)"
+          --ruleset-name="$VAR(@)"; then
+          exit 1
+      fi
diff --git a/templates/zone-policy/zone/node.tag/interface/node.def b/templates/zone-policy/zone/node.tag/interface/node.def
index 824d3cda..845a5e8c 100644
--- a/templates/zone-policy/zone/node.tag/interface/node.def
+++ b/templates/zone-policy/zone/node.tag/interface/node.def
@@ -5,12 +5,18 @@ allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all | sed -e s/'lo '//
 
 create: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn
 
-create: /opt/vyatta/sbin/vyatta-zone.pl 	\
+create: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl 	\
 	  --action=add-zone-interface		\
           --zone-name="$VAR(../@)"		\
-          --interface="$VAR(@)"
+          --interface="$VAR(@)"; then
+	  exit 1
+	fi
 
-delete: /opt/vyatta/sbin/vyatta-zone.pl 	\
+delete: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl 	\
 	  --action=delete-zone-interface	\
           --zone-name="$VAR(../@)"	 	\
-          --interface="$VAR(@)"
+          --interface="$VAR(@)"; then
+	  exit 1
+	fi
diff --git a/templates/zone-policy/zone/node.tag/local-zone/node.def b/templates/zone-policy/zone/node.tag/local-zone/node.def
index 77a49771..4b045302 100644
--- a/templates/zone-policy/zone/node.tag/local-zone/node.def
+++ b/templates/zone-policy/zone/node.tag/local-zone/node.def
@@ -1,9 +1,15 @@
 help: Set zone to be local-zone
 
-create: /opt/vyatta/sbin/vyatta-zone.pl         \
+create: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=add-localzone                \
-          --zone-name="$VAR(../@)"
+          --zone-name="$VAR(../@)"; then
+	  exit 1
+	fi
 
-delete: /opt/vyatta/sbin/vyatta-zone.pl         \
+delete: 
+	if ! /opt/vyatta/sbin/vyatta-zone.pl	\
           --action=delete-localzone             \
-          --zone-name="$VAR(../@)"
+          --zone-name="$VAR(../@)"; then
+	  exit 1
+	fi