diff options
| author | Daniil Baturin <daniil@vyos.io> | 2022-08-04 15:41:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 15:41:13 +0100 |
| commit | c8ba6bc59d981309552c90e845c560ec2bd9b21c (patch) | |
| tree | 287c8d5e3f85f43584a9f19782722b2c89cbefbd | |
| parent | 241fad230beed8889719e08f0fdb9f08d1404e0f (diff) | |
| parent | 67583141f433c31ebccc8eeba06b2b285636e680 (diff) | |
| download | vyos-1x-c8ba6bc59d981309552c90e845c560ec2bd9b21c.tar.gz vyos-1x-c8ba6bc59d981309552c90e845c560ec2bd9b21c.zip | |
Merge pull request #1453 from sever-sever/T4572-eq
mtu: T4572: Add DHCP-option MTU to get values from DHCP-server
| -rw-r--r-- | interface-definitions/include/interface/dhcp-options.xml.i | 6 | ||||
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i index 39a3dbb2e..5b30ca08b 100644 --- a/interface-definitions/include/interface/dhcp-options.xml.i +++ b/interface-definitions/include/interface/dhcp-options.xml.i @@ -14,6 +14,12 @@ <help>Override system host-name sent to DHCP server</help> </properties> </leafNode> + <leafNode name="mtu"> + <properties> + <help>Use MTU value from DHCP server - ignore interface setting</help> + <valueless/> + </properties> + </leafNode> <leafNode name="vendor-class-id"> <properties> <help>Identify the vendor client type to the DHCP server</help> diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index 9b08d83de..7dbedea45 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -1375,7 +1375,7 @@ class Interface(Control): # before mangling any IPv6 option. If MTU is less then 1280 IPv6 will be # automatically disabled by the kernel. Also MTU must be increased before # configuring any IPv6 address on the interface. - if 'mtu' in config: + if 'mtu' in config and dict_search('dhcp_options.mtu', config) == None: self.set_mtu(config.get('mtu')) # Only change IPv6 parameters if IPv6 was not explicitly disabled |