From 7479329761a80e41b86c8959ebed8c451a4da980 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 5 Sep 2021 19:04:53 +0200 Subject: T3804: merge "system name-servers-dhcp" into "system name-server" --- docs/configuration/system/name-servers-dhcp.disable | 2 -- docs/configuration/vrf/index.rst | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 docs/configuration/system/name-servers-dhcp.disable diff --git a/docs/configuration/system/name-servers-dhcp.disable b/docs/configuration/system/name-servers-dhcp.disable deleted file mode 100644 index 6719fef9..00000000 --- a/docs/configuration/system/name-servers-dhcp.disable +++ /dev/null @@ -1,2 +0,0 @@ -name-servers-dhcp -################# \ No newline at end of file diff --git a/docs/configuration/vrf/index.rst b/docs/configuration/vrf/index.rst index e172dade..9b48668a 100644 --- a/docs/configuration/vrf/index.rst +++ b/docs/configuration/vrf/index.rst @@ -346,25 +346,25 @@ Configuration set interfaces bridge br10 member interface eth3 set interfaces bridge br10 member interface eth4 set interfaces bridge br10 vrf 'red' - + set interfaces ethernet eth0 address 'dhcp' set interfaces ethernet eth0 vrf 'mgmt' set interfaces ethernet eth1 address '10.0.0.254/24' set interfaces ethernet eth2 address '10.20.0.254/24' set interfaces ethernet eth2 vrf 'blue' - + set protocols static interface-route 10.20.0.0/24 next-hop-interface eth2 next-hop-vrf 'blue' set protocols static interface-route 10.30.0.0/24 next-hop-interface br10 next-hop-vrf 'red' set protocols vrf blue static interface-route 10.0.0.0/24 next-hop-interface eth1 next-hop-vrf 'default' set protocols vrf red static interface-route 10.0.0.0/24 next-hop-interface eth1 next-hop-vrf 'default' - + set service ssh disable-host-validation set service ssh vrf 'mgmt' - + set system domain-name 'vyos.net' set system host-name 'R1' - set system name-servers-dhcp 'eth0' - + set system name-server 'eth0' + set vrf name blue table '3000' set vrf name mgmt table '1000' set vrf name red table '2000' -- cgit v1.2.3