4 files changed, 21 insertions, 6 deletions
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new
index 4e387c0d..ae723627 100755
--- a/scripts/install/install-postinst-new
+++ b/scripts/install/install-postinst-new
@@ -47,8 +47,8 @@ copy_config () {
     # that this will include any changes made and saved by the user,
     # as well as changes such as interface MAC addresses automatically
     # generated by the user.  So it is the first choice.
-    if [ -f "${VYATTA_NEW_CFG_DIR}/config.boot" ]; then
-      config=${VYATTA_NEW_CFG_DIR}/config.boot
+    if [ -f "${VYATTA_CFG_DIR}/config.boot" ]; then
+      config=${VYATTA_CFG_DIR}/config.boot
     fi
 
     # Third candidate: The default config file
diff --git a/templates/interfaces/vxlan/node.def b/templates/interfaces/vxlan/node.def
index 0a3db8cc..e8b625e1 100644
--- a/templates/interfaces/vxlan/node.def
+++ b/templates/interfaces/vxlan/node.def
@@ -21,6 +21,7 @@ create:
   VXLAN_GROUP=""
   VXLAN_VNI="id $VAR(./vni/@)"
   VXLAN_TTL="ttl 16"
+  VXLAN_PORT=""
 
   if [ ! $VAR(./link/) == "" ]; then
     VXLAN_DEV="dev $VAR(./link/@)"
@@ -39,13 +40,16 @@ create:
     exit 1
   fi
 
-  sudo ip link add name $VAR(@) type vxlan 	\
-	$VXLAN_VNI $VXLAN_GROUP $VXLAN_TTL $VXLAN_DEV
+  if [ ! $VAR(./remote-port/) == "" ]; then
+    VXLAN_PORT="dstport $VAR(./remote-port/@)"
+  fi
+
+  sudo ip link add name $VAR(@) type vxlan \
+	$VXLAN_VNI $VXLAN_GROUP $VXLAN_TTL $VXLAN_DEV $VXLAN_PORT
   sudo ip link set $VAR(@) up
 
   touch /tmp/vxlan-$VAR(@)-create
 
-
 delete:
   if [ ! -e /sys/class/net/$VAR(@) ]; then
     echo "VXLAN interface \"$VAR(@)\" does not exist."
diff --git a/templates/interfaces/vxlan/node.tag/remote-port/node.def b/templates/interfaces/vxlan/node.tag/remote-port/node.def
new file mode 100644
index 00000000..c1b4f672
--- /dev/null
+++ b/templates/interfaces/vxlan/node.tag/remote-port/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Remote port for this VXLAN tunnel
+val_help: u32:1-65535; Numeric IP port
+syntax:expression: $VAR(@) > 0 && $VAR(@) < 65536;
+                   "Port must be between 1 and 65535"
+
+update:
+  if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then
+    echo "Changing remote port requires delete/create this vxlan interface"
+    exit 1
+  fi
diff --git a/templates/interfaces/vxlan/node.tag/remote/node.def b/templates/interfaces/vxlan/node.tag/remote/node.def
index 4048b5fc..5e789c48 100644
--- a/templates/interfaces/vxlan/node.tag/remote/node.def
+++ b/templates/interfaces/vxlan/node.tag/remote/node.def
@@ -4,6 +4,6 @@ val_help: ipv4; Remote address of this VXLAN tunnel
 
 update:
   if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then
-    echo "Chainging remote requires delete/create this vxlan interface"
+    echo "Changing remote requires delete/create this vxlan interface"
     exit 1
   fi