From 4b246014e42b2ab0ea0736b4bb422132de3fa458 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Wed, 23 Jul 2008 12:06:06 +0000 Subject: Fix Bug 3318 ENHANCEMENT REQUEST: Option to NOT Accept DHCP MTU Offers Below Specified Value - only request for dhcp-option interface-mtu from a dhcp-server for an ethernet interface using dhcp to get IP - do not request for interface-mtu for other interfaces that use dhcp i.e. ethernet vifs and bridges - request for interface-mtu from dhcp-server for ethernet interfaces, only if ethernet mtu not set in CLI --- templates/interfaces/ethernet/node.tag/mtu/node.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def index 07c102a..74c238a 100644 --- a/templates/interfaces/ethernet/node.tag/mtu/node.def +++ b/templates/interfaces/ethernet/node.tag/mtu/node.def @@ -1,5 +1,5 @@ type: u32 help: Set the Maximum Transmission Unit (MTU) for this interface syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" -update:expression: "sudo ip link set $VAR(../@) mtu $VAR(@)"; "Error setting MTU on dev $VAR(../@)" -delete:expression: "sudo ip link set $VAR(../@) mtu 1500"; "Error deleting MTU on dev $VAR(../@)" +update:expression: "sudo ip link set $VAR(../@) mtu $VAR(@) && echo $VAR(@) > /tmp/dhclient_mtu_check_$VAR(../@)"; "Error setting MTU on dev $VAR(../@)" +delete:expression: "sudo ip link set $VAR(../@) mtu 1500 && rm -f /tmp/dhclient_mtu_check_$VAR(../@)"; "Error deleting MTU on dev $VAR(../@)" -- cgit v1.2.3 From 1ac0df0545fd2a467cc96a5b09cb6bb69e1430f6 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Wed, 23 Jul 2008 14:45:24 +0000 Subject: Fix bug 3318 dont't create unnecessary temporary files, use already created file in active config to retrieve mtu value --- templates/interfaces/ethernet/node.tag/mtu/node.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def index 74c238a..07c102a 100644 --- a/templates/interfaces/ethernet/node.tag/mtu/node.def +++ b/templates/interfaces/ethernet/node.tag/mtu/node.def @@ -1,5 +1,5 @@ type: u32 help: Set the Maximum Transmission Unit (MTU) for this interface syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" -update:expression: "sudo ip link set $VAR(../@) mtu $VAR(@) && echo $VAR(@) > /tmp/dhclient_mtu_check_$VAR(../@)"; "Error setting MTU on dev $VAR(../@)" -delete:expression: "sudo ip link set $VAR(../@) mtu 1500 && rm -f /tmp/dhclient_mtu_check_$VAR(../@)"; "Error deleting MTU on dev $VAR(../@)" +update:expression: "sudo ip link set $VAR(../@) mtu $VAR(@)"; "Error setting MTU on dev $VAR(../@)" +delete:expression: "sudo ip link set $VAR(../@) mtu 1500"; "Error deleting MTU on dev $VAR(../@)" -- cgit v1.2.3 From e1cc907f3e29bfedf123c28da24d45f187198ece Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 29 Jul 2008 10:20:06 -0700 Subject: Add ipv6 address to comp_help. --- templates/interfaces/ethernet/node.tag/address/node.def | 1 + templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def | 1 + templates/interfaces/loopback/node.tag/address/node.def | 1 + 3 files changed, 3 insertions(+) (limited to 'templates') diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def index 0ff02c8..d523793 100644 --- a/templates/interfaces/ethernet/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/address/node.def @@ -7,5 +7,6 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete allowed: echo "dhcp <>" comp_help:Possible completions: Set the IP address and prefix length + Set the IPv6 address and prefix length dhcp Set the IP address and prefix length via DHCP diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def index cb9cedc..625130a 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def @@ -7,4 +7,5 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete allowed: echo "dhcp <>" comp_help:Possible completions: Set the IP address and prefix length + Set the IPv6 address and prefix length dhcp Set the IP address and prefix length via DHCP diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def index 03ead09..9faf664 100644 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ b/templates/interfaces/loopback/node.tag/address/node.def @@ -12,3 +12,4 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete comp_help:Possible completions: Set the IP address and prefix length + Set the IPv6 address and prefix length -- cgit v1.2.3