summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/contributing/development.rst1
-rw-r--r--docs/firewall.rst4
-rw-r--r--docs/interfaces/pppoe.rst22
3 files changed, 18 insertions, 9 deletions
diff --git a/docs/contributing/development.rst b/docs/contributing/development.rst
index 93168366..4a181499 100644
--- a/docs/contributing/development.rst
+++ b/docs/contributing/development.rst
@@ -694,6 +694,7 @@ Kernel boot parameters
CLI. In this circumstance, the kernel boot parameter ``vyos-config-debug``
will ensure access to the system as user ``vyos``, and will log a Python
stack trace to the file ``/tmp/boot-config-trace``.
+ File ``boot-config-trace`` will generate only if config loaded with a failure status.
Debugging features
------------------
diff --git a/docs/firewall.rst b/docs/firewall.rst
index 27dd11fd..7b6be614 100644
--- a/docs/firewall.rst
+++ b/docs/firewall.rst
@@ -405,9 +405,9 @@ There are a lot of matching criteria gainst which the package can be tested.
set firewall name WAN-IN-v4 rule 13 tcp flags 'SYN,!ACK,!FIN,!RST'
.. cfgcmd:: set firewall name <name> rule <1-9999> state [established |
- invalid | new | releated]
+ invalid | new | related] [enable | disable ]
.. cfgcmd:: set firewall ipv6-name <name> rule <1-9999> state [established |
- invalid | new | releated]
+ invalid | new | related] [enable | disable ]
Match against the state of a packet.
diff --git a/docs/interfaces/pppoe.rst b/docs/interfaces/pppoe.rst
index 21af40f8..d58943b8 100644
--- a/docs/interfaces/pppoe.rst
+++ b/docs/interfaces/pppoe.rst
@@ -173,9 +173,17 @@ Prefix Delegation (DHCPv6-PD)
VyOS 1.3 (equuleus) supports DHCPv6-PD. DHCPv6 Prefix Delegation is supported
by most ISPs who provide native IPv6 for consumers on fixed networks.
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option delegate <prefix-interface> interfaces-id <id>
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation length <length>
- This statement specifies the interface id. ID must be a decimal integer.
+ Some ISPs by default only delegate a /64 prefix. To request for a specific
+ prefix size use this option to request for a bigger delegation. This value
+ is in the range from 32 - 64 so you could request up to /32 down to a /64
+ delegation.
+
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation interface <prefix-interface> address <local-addr>
+
+ This statement specifies the interface address used locally on the interfcae
+ where the prefix has been delegated to. ID must be a decimal integer.
It will be combined with the delegated prefix and the sla-id to form a
complete interface address. The default is to use the EUI-64 address of the
interface.
@@ -185,7 +193,7 @@ by most ISPs who provide native IPv6 for consumers on fixed networks.
Using `<id>` value 65535 will assign IPv6 address <prefix>::ffff to the
interface.
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option delegate <prefix-interface> sla-id <id>
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation interface <prefix-interface> sla-id <id>
This statement specifies the identifier value of the site-level aggregator
(SLA) on the interface. ID must be a decimal number greater then 0 which
@@ -194,7 +202,7 @@ by most ISPs who provide native IPv6 for consumers on fixed networks.
the two values into a single IPv6 prefix, 2001:db8:ffff:1::/64, and will
configure the prefix on the specified interface.
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option delegate <prefix-interface> sla-len <len>
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation interface <prefix-interface> sla-len <len>
This statement specifies the length of the SLA ID in bits. `<len>` must be a
decimal number between 0 and 128. If the length is not specified by this
@@ -316,9 +324,9 @@ If you do not know the prefix size delegated to you, start with sla-len 0.
set interfaces pppoe pppoe0 authentication user vyos
set interfaces pppoe pppoe0 authentication password vyos
- set interfaces pppoe pppoe0 dhcpv6-options delegate eth0 interface-id 65535
- set interfaces pppoe pppoe0 dhcpv6-options delegate eth0 sla-id 0
- set interfaces pppoe pppoe0 dhcpv6-options delegate eth0 sla-len 8
+ set interfaces pppoe pppoe0 dhcpv6-options prefix-delegation interface eth0 address 65535
+ set interfaces pppoe pppoe0 dhcpv6-options prefix-delegation interface eth0 sla-id 0
+ set interfaces pppoe pppoe0 dhcpv6-options prefix-delegation interface eth0 sla-len 8
set interfaces pppoe pppoe0 ipv6 address autoconf
set interfaces pppoe pppoe0 ipv6 enable
set interfaces pppoe pppoe0 source-interface eth1