summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/_static/images/apu4_desk_1.jpg (renamed from docs/_static/images/apu4c4_desk_1.jpg)bin816206 -> 816206 bytes
-rw-r--r--docs/_static/images/apu4_desk_2.jpg (renamed from docs/_static/images/apu4c4_desk_2.jpg)bin288989 -> 288989 bytes
-rw-r--r--docs/_static/images/apu4_desk_3.jpg (renamed from docs/_static/images/apu4c4_desk_3.jpg)bin831843 -> 831843 bytes
-rw-r--r--docs/_static/images/apu4_desk_4.jpg (renamed from docs/_static/images/apu4c4_desk_4.jpg)bin804070 -> 804070 bytes
-rw-r--r--docs/_static/images/apu4_rack_1.jpgbin0 -> 305789 bytes
-rw-r--r--docs/_static/images/apu4_rack_2.jpgbin0 -> 623490 bytes
-rw-r--r--docs/_static/images/apu4_rack_3.jpgbin0 -> 1113842 bytes
-rw-r--r--docs/_static/images/apu4_rack_4.jpgbin0 -> 1676612 bytes
-rw-r--r--docs/_static/images/apu4_rack_5.jpgbin0 -> 1584027 bytes
-rw-r--r--docs/_static/images/apu4_rack_vyos_print.jpgbin0 -> 569311 bytes
-rw-r--r--docs/_static/images/apu4c4_rack_1.jpgbin431802 -> 0 bytes
-rw-r--r--docs/_static/images/apu4c4_rack_2.jpgbin867428 -> 0 bytes
-rw-r--r--docs/_static/images/apu4c4_rack_3.jpgbin1553860 -> 0 bytes
-rw-r--r--docs/_static/images/apu4c4_rack_4.jpgbin1676532 -> 0 bytes
-rw-r--r--docs/_static/images/apu4c4_rack_5.jpgbin2957985 -> 0 bytes
-rw-r--r--docs/appendix/cmd-index.rst14
-rw-r--r--docs/appendix/http-api.rst24
-rw-r--r--docs/appendix/vyos-on-baremetal.rst42
-rw-r--r--docs/contributing/build-vyos.rst4
-rw-r--r--docs/contributing/development.rst1
-rw-r--r--docs/firewall.rst4
-rw-r--r--docs/interfaces/advanced-index.rst1
-rw-r--r--docs/interfaces/ethernet.rst32
-rw-r--r--docs/interfaces/macsec.rst179
-rw-r--r--docs/interfaces/pppoe.rst26
-rw-r--r--docs/services/mdns-repeater.rst2
-rw-r--r--docs/system/serial-console.rst4
27 files changed, 290 insertions, 43 deletions
diff --git a/docs/_static/images/apu4c4_desk_1.jpg b/docs/_static/images/apu4_desk_1.jpg
index b7a3d08e..b7a3d08e 100644
--- a/docs/_static/images/apu4c4_desk_1.jpg
+++ b/docs/_static/images/apu4_desk_1.jpg
Binary files differ
diff --git a/docs/_static/images/apu4c4_desk_2.jpg b/docs/_static/images/apu4_desk_2.jpg
index fe356e1f..fe356e1f 100644
--- a/docs/_static/images/apu4c4_desk_2.jpg
+++ b/docs/_static/images/apu4_desk_2.jpg
Binary files differ
diff --git a/docs/_static/images/apu4c4_desk_3.jpg b/docs/_static/images/apu4_desk_3.jpg
index af7dc406..af7dc406 100644
--- a/docs/_static/images/apu4c4_desk_3.jpg
+++ b/docs/_static/images/apu4_desk_3.jpg
Binary files differ
diff --git a/docs/_static/images/apu4c4_desk_4.jpg b/docs/_static/images/apu4_desk_4.jpg
index 37251af2..37251af2 100644
--- a/docs/_static/images/apu4c4_desk_4.jpg
+++ b/docs/_static/images/apu4_desk_4.jpg
Binary files differ
diff --git a/docs/_static/images/apu4_rack_1.jpg b/docs/_static/images/apu4_rack_1.jpg
new file mode 100644
index 00000000..3793cd39
--- /dev/null
+++ b/docs/_static/images/apu4_rack_1.jpg
Binary files differ
diff --git a/docs/_static/images/apu4_rack_2.jpg b/docs/_static/images/apu4_rack_2.jpg
new file mode 100644
index 00000000..b8caf976
--- /dev/null
+++ b/docs/_static/images/apu4_rack_2.jpg
Binary files differ
diff --git a/docs/_static/images/apu4_rack_3.jpg b/docs/_static/images/apu4_rack_3.jpg
new file mode 100644
index 00000000..08ff633e
--- /dev/null
+++ b/docs/_static/images/apu4_rack_3.jpg
Binary files differ
diff --git a/docs/_static/images/apu4_rack_4.jpg b/docs/_static/images/apu4_rack_4.jpg
new file mode 100644
index 00000000..a88d62fe
--- /dev/null
+++ b/docs/_static/images/apu4_rack_4.jpg
Binary files differ
diff --git a/docs/_static/images/apu4_rack_5.jpg b/docs/_static/images/apu4_rack_5.jpg
new file mode 100644
index 00000000..644b8e0a
--- /dev/null
+++ b/docs/_static/images/apu4_rack_5.jpg
Binary files differ
diff --git a/docs/_static/images/apu4_rack_vyos_print.jpg b/docs/_static/images/apu4_rack_vyos_print.jpg
new file mode 100644
index 00000000..a0bbaab2
--- /dev/null
+++ b/docs/_static/images/apu4_rack_vyos_print.jpg
Binary files differ
diff --git a/docs/_static/images/apu4c4_rack_1.jpg b/docs/_static/images/apu4c4_rack_1.jpg
deleted file mode 100644
index 05e3f93d..00000000
--- a/docs/_static/images/apu4c4_rack_1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/_static/images/apu4c4_rack_2.jpg b/docs/_static/images/apu4c4_rack_2.jpg
deleted file mode 100644
index fd4b6e56..00000000
--- a/docs/_static/images/apu4c4_rack_2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/_static/images/apu4c4_rack_3.jpg b/docs/_static/images/apu4c4_rack_3.jpg
deleted file mode 100644
index b155bd93..00000000
--- a/docs/_static/images/apu4c4_rack_3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/_static/images/apu4c4_rack_4.jpg b/docs/_static/images/apu4c4_rack_4.jpg
deleted file mode 100644
index 99b12b23..00000000
--- a/docs/_static/images/apu4c4_rack_4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/_static/images/apu4c4_rack_5.jpg b/docs/_static/images/apu4c4_rack_5.jpg
deleted file mode 100644
index 534bbad6..00000000
--- a/docs/_static/images/apu4c4_rack_5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/appendix/cmd-index.rst b/docs/appendix/cmd-index.rst
index fa4143ad..71b556cb 100644
--- a/docs/appendix/cmd-index.rst
+++ b/docs/appendix/cmd-index.rst
@@ -4,6 +4,12 @@
Command Reference
#################
+Configuration Commands
+======================
+
+.. _cfg_cmd_list:
+
+.. cfgcmdlist::
Operational Commands
====================
@@ -11,11 +17,3 @@ Operational Commands
.. _op_cmd_list:
.. opcmdlist::
-
-
-Configuration Commands
-======================
-
-.. _cfg_cmd_list:
-
-.. cfgcmdlist::
diff --git a/docs/appendix/http-api.rst b/docs/appendix/http-api.rst
index 86d8b394..49f2dbd9 100644
--- a/docs/appendix/http-api.rst
+++ b/docs/appendix/http-api.rst
@@ -99,8 +99,30 @@ If you don't specify the file when saving, it saves to ``/config/config.boot``.
# curl -k -X POST -F key=MY-HTTP-API-PLAINTEXT-KEY -Fdata='{"op": "save", "file": "/config/config.boot"}' https://192.168.122.127/config-file
+Image management requests
+-------------------------
+
+One may ``add`` or ``delete`` a system image using the endpoint ``/image``. Here are the respective examples:
+
+``add`` from ``url``. Here we use the URL of the latest rolling release:
+
+.. code-block:: none
+
+ # curl -k -X POST -F data='{"op": "add", "url": "https://downloads.vyos.io/rolling/current/amd64/vyos-rolling-latest.iso"}' -F key=MY-HTTP-API-PLAINTEXT-KEY https://192.168.122.127/image
+
+``delete`` by image ``name``. For example:
+
+.. code-block:: none
+
+ # curl -k -X POST -F data='{"op": "delete", "name": "1.3-rolling-202006070117"}' -F key=MY-HTTP-API-PLAINTEXT-KEY https://192.168.122.127/image
+
+To list the available system images by name, one may use the operational mode request ``show`` discussed in the next section; in this setting it would be:
+
+.. code-block:: none
+
+ # curl -k -X POST -F data='{"op": "show", "path": ["system", "image"]}' -F key=MY-HTTP-API-PLAINTEXT-KEY https://192.168.122.127/show
-Operational mode commands
+Operational mode requests
-------------------------
It is possible to run ``show`` and ``generate`` commands:
diff --git a/docs/appendix/vyos-on-baremetal.rst b/docs/appendix/vyos-on-baremetal.rst
index 1481156f..0116ddc1 100644
--- a/docs/appendix/vyos-on-baremetal.rst
+++ b/docs/appendix/vyos-on-baremetal.rst
@@ -214,45 +214,51 @@ Pictures
Rack Mount
^^^^^^^^^^
-.. figure:: /_static/images/apu4c4_rack_1.jpg
+.. figure:: /_static/images/apu4_rack_1.jpg
:scale: 25 %
- :alt: APU4C4 rack closed
+ :alt: APU4 rack closed
-.. figure:: /_static/images/apu4c4_rack_2.jpg
+.. figure:: /_static/images/apu4_rack_2.jpg
:scale: 25 %
- :alt: APU4C4 rack front
+ :alt: APU4 rack front
-.. figure:: /_static/images/apu4c4_rack_3.jpg
+.. figure:: /_static/images/apu4_rack_3.jpg
:scale: 25 %
- :alt: APU4C4 rack module #1
+ :alt: APU4 rack module #1
-.. figure:: /_static/images/apu4c4_rack_4.jpg
+.. figure:: /_static/images/apu4_rack_4.jpg
:scale: 25 %
- :alt: APU4C4 rack module #2
+ :alt: APU4 rack module #2
-.. figure:: /_static/images/apu4c4_rack_5.jpg
+.. figure:: /_static/images/apu4_rack_5.jpg
:scale: 25 %
- :alt: APU4C4 rack module #3 with PSU
+ :alt: APU4 rack module #3 with PSU
+VyOS custom print
+"""""""""""""""""
+
+.. figure:: /_static/images/apu4_rack_vyos_print.jpg
+ :scale: 25 %
+ :alt: APU4 custom VyOS powder coat
Desktop / Bench Top
^^^^^^^^^^^^^^^^^^^
-.. figure:: /_static/images/apu4c4_desk_1.jpg
+.. figure:: /_static/images/apu4_desk_1.jpg
:scale: 25 %
- :alt: APU4C4 desktop closed
+ :alt: APU4 desktop closed
-.. figure:: /_static/images/apu4c4_desk_2.jpg
+.. figure:: /_static/images/apu4_desk_2.jpg
:scale: 25 %
- :alt: APU4C4 desktop closed
+ :alt: APU4 desktop closed
-.. figure:: /_static/images/apu4c4_desk_3.jpg
+.. figure:: /_static/images/apu4_desk_3.jpg
:scale: 25 %
- :alt: APU4C4 desktop back
+ :alt: APU4 desktop back
-.. figure:: /_static/images/apu4c4_desk_4.jpg
+.. figure:: /_static/images/apu4_desk_4.jpg
:scale: 25 %
- :alt: APU4C4 desktop back
+ :alt: APU4 desktop back
.. _Rufus: https://rufus.ie/
diff --git a/docs/contributing/build-vyos.rst b/docs/contributing/build-vyos.rst
index 302f828c..51400eaf 100644
--- a/docs/contributing/build-vyos.rst
+++ b/docs/contributing/build-vyos.rst
@@ -249,7 +249,7 @@ Executed from the root of `vyos-build`
.. code-block:: none
- $ docker run --rm -it -v $(pwd):/vyos -w /vyos/packages/PACKAGENAME \
+ $ docker run --rm -it -v $(pwd):/vyos -w /vyos \
--sysctl net.ipv6.conf.lo.disable_ipv6=0 \
vyos-builder scripts/build-packages -b <package>
@@ -278,7 +278,7 @@ Example using `git@github.com:myname/vyos-1x.git` repository to build vyos-1x:
$ cd packages
$ git clone git@github.com:myname/vyos-1x.git
$ cd ..
- $ docker run --rm -it -v $(pwd):/vyos -w /vyos/packages/PACKAGENAME \
+ $ docker run --rm -it -v $(pwd):/vyos -w /vyos \
--sysctl net.ipv6.conf.lo.disable_ipv6=0 \
vyos-builder scripts/build-packages -b vyos-1x
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/advanced-index.rst b/docs/interfaces/advanced-index.rst
index e34cf2b0..c666f7ae 100644
--- a/docs/interfaces/advanced-index.rst
+++ b/docs/interfaces/advanced-index.rst
@@ -12,6 +12,7 @@ Advanced Network Interfaces
dummy
geneve
l2tpv3
+ macsec
pseudo-ethernet
qinq
tunnel
diff --git a/docs/interfaces/ethernet.rst b/docs/interfaces/ethernet.rst
index 580f1914..0633ad2c 100644
--- a/docs/interfaces/ethernet.rst
+++ b/docs/interfaces/ethernet.rst
@@ -168,6 +168,38 @@ Operation
supports-register-dump: yes
supports-priv-flags: no
+.. opcmd:: show interfaces ethernet <interface> physical offload
+
+ Show available offloading functions on given `<interface>`
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces ethernet eth0 physical offload
+ rx-checksumming on
+ tx-checksumming on
+ tx-checksum-ip-generic on
+ scatter-gather off
+ tx-scatter-gather off
+ tcp-segmentation-offload off
+ tx-tcp-segmentation off
+ tx-tcp-mangleid-segmentation off
+ tx-tcp6-segmentation off
+ udp-fragmentation-offload off
+ generic-segmentation-offload off
+ generic-receive-offload off
+ large-receive-offload off
+ rx-vlan-offload on
+ tx-vlan-offload on
+ ntuple-filters off
+ receive-hashing on
+ tx-gre-segmentation on
+ tx-gre-csum-segmentation on
+ tx-udp_tnl-segmentation on
+ tx-udp_tnl-csum-segmentation on
+ tx-gso-partial on
+ tx-nocache-copy off
+ rx-all off
+
.. opcmd:: show interfaces ethernet <interface> transceiver
Show transceiver information from plugin modules, e.g SFP+, QSFP
diff --git a/docs/interfaces/macsec.rst b/docs/interfaces/macsec.rst
new file mode 100644
index 00000000..d7af0c16
--- /dev/null
+++ b/docs/interfaces/macsec.rst
@@ -0,0 +1,179 @@
+.. _macsec-interface:
+
+######
+MACsec
+######
+
+MACsec is an IEEE standard (IEEE 802.1AE) for MAC security, introduced in 2006.
+It defines a way to establish a protocol independent connection between two
+hosts with data confidentiality, authenticity and/or integrity, using
+GCM-AES-128. MACsec operates on the Ethernet layer and as such is a layer 2
+protocol, which means it's designed to secure traffic within a layer 2 network,
+including DHCP or ARP requests. It does not compete with other security
+solutions such as IPsec (layer 3) or TLS (layer 4), as all those solutions are
+used for their own specific use cases.
+
+Configuration
+#############
+
+.. cfgcmd:: set interfaces macsec <interface> security cipher [gcm-aes-128]
+
+ Select cipher suite used for cryptographic operations. This setting is
+ mandatory.
+
+ .. note:: gcm-aes-256 support planned once iproute2 package is updated to
+ version >=5.2.
+
+.. cfgcmd:: set interfaces macsec <interface> security encrypt
+
+ MACsec only provides authentication by default, encryption is optional. This
+ command will enable encryption for all outgoing packets.
+
+.. cfgcmd:: set interfaces macsec <interface> source-interface <physical-source>
+
+ A physical interface is required to connect this MACsec instance to. Traffic
+ leaving this interfac will now be authenticated/encrypted.
+
+
+Key Management
+--------------
+
+:abbr:`MKA (MACsec Key Agreement protocol)` is used to synchronize keys between
+individual peers.
+
+.. cfgcmd:: set interfaces macsec <interface> security mka cak <key>
+
+ IEEE 802.1X/MACsec pre-shared key mode. This allows to configure MACsec with
+ a pre-shared key using a (CAK,CKN) pair.
+
+.. cfgcmd:: set interfaces macsec <interface> security mka ckn <key>
+
+ CAK Name
+
+.. cfgcmd:: set interfaces macsec <interface> security mka priority <priority>
+
+ The peer with lower priority will become the key server and start
+ distributing SAKs.
+
+Replay protection
+-----------------
+
+.. cfgcmd:: set interfaces macsec <interface> security replay-window <window>
+
+ IEEE 802.1X/MACsec replay protection window. This determines a window in which
+ replay is tolerated, to allow receipt of frames that have been misordered by
+ the network.
+
+ - ``0``: No replay window, strict check
+ - ``1-4294967295``: Number of packets that could be misordered
+
+Operation
+=========
+
+.. opcmd:: run generate macsec mka-cak
+
+ Generate :abbr:`MKA (MACsec Key Agreement protocol)` CAK key
+
+ .. code-block:: none
+
+ vyos@vyos:~$ generate macsec mka-cak
+ 20693b6e08bfa482703a563898c9e3ad
+
+
+.. opcmd:: run generate macsec mka-ckn
+
+ Generate :abbr:`MKA (MACsec Key Agreement protocol)` CAK key
+
+ .. code-block:: none
+
+ vyos@vyos:~$ generate macsec mka-ckn
+ 88737efef314ee319b2cbf30210a5f164957d884672c143aefdc0f5f6bc49eb2
+
+.. opcmd:: show interfaces macsec
+
+ List all MACsec interfaces
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces macsec
+ 17: macsec1: protect on validate strict sc off sa off encrypt on send_sci on end_station off scb off replay off
+ cipher suite: GCM-AES-128, using ICV length 16
+ TXSC: 005056bfefaa0001 on SA 0
+ 20: macsec0: protect on validate strict sc off sa off encrypt off send_sci on end_station off scb off replay off
+ cipher suite: GCM-AES-128, using ICV length 16
+ TXSC: 005056bfefaa0001 on SA 0
+
+.. opcmd:: show interfaces macsec <interface>
+
+ Show specific MACsec interface information
+
+ .. code-block:: none
+
+ vyos@vyos:~$ show interfaces macsec macsec1
+ 17: macsec1: protect on validate strict sc off sa off encrypt on send_sci on end_station off scb off replay off
+ cipher suite: GCM-AES-128, using ICV length 16
+ TXSC: 005056bfefaa0001 on SA 0
+
+Examples
+========
+
+* Two routers connected both via eth1 through an untrusted switch
+* R1 has 192.0.2.1/24 & 2001:db8::1/64
+* R2 has 192.0.2.2/24 & 2001:db8::2/64
+
+**R1**
+
+.. code-block:: none
+
+ set interfaces macsec macsec1 address '192.0.2.1/24'
+ set interfaces macsec macsec1 address '2001:db8::1/64'
+ set interfaces macsec macsec1 security cipher 'gcm-aes-128'
+ set interfaces macsec macsec1 security encrypt
+ set interfaces macsec macsec1 security mka cak '232e44b7fda6f8e2d88a07bf78a7aff4'
+ set interfaces macsec macsec1 security mka ckn '40916f4b23e3d548ad27eedd2d10c6f98c2d21684699647d63d41b500dfe8836'
+ set interfaces macsec macsec1 source-interface 'eth1'
+
+**R2**
+
+.. code-block:: none
+
+ set interfaces macsec macsec1 address '192.0.2.2/24'
+ set interfaces macsec macsec1 address '2001:db8::2/64'
+ set interfaces macsec macsec1 security cipher 'gcm-aes-128'
+ set interfaces macsec macsec1 security encrypt
+ set interfaces macsec macsec1 security mka cak '232e44b7fda6f8e2d88a07bf78a7aff4'
+ set interfaces macsec macsec1 security mka ckn '40916f4b23e3d548ad27eedd2d10c6f98c2d21684699647d63d41b500dfe8836'
+ set interfaces macsec macsec1 source-interface 'eth1'
+
+Pinging (IPv6) the other host and intercepting the traffic in ``eth1`` will
+show you the content is encrypted.
+
+.. code-block:: none
+
+ 17:35:44.586668 00:50:56:bf:ef:aa > 00:50:56:b3:ad:d6, ethertype Unknown (0x88e5), length 150:
+ 0x0000: 2c00 0000 000a 0050 56bf efaa 0001 d9fb ,......PV.......
+ 0x0010: 920a 8b8d 68ed 9609 29dd e767 25a4 4466 ....h...)..g%.Df
+ 0x0020: 5293 487b 9990 8517 3b15 22c7 ea5c ac83 R.H{....;."..\..
+ 0x0030: 4c6e 13cf 0743 f917 2c4e 694e 87d1 0f09 Ln...C..,NiN....
+ 0x0040: 0f77 5d53 ed75 cfe1 54df 0e5a c766 93cb .w]S.u..T..Z.f..
+ 0x0050: c4f2 6e23 f200 6dfe 3216 c858 dcaa a73b ..n#..m.2..X...;
+ 0x0060: 4dd1 9358 d9e4 ed0e 072f 1acc 31c4 f669 M..X...../..1..i
+ 0x0070: e93a 9f38 8a62 17c6 2857 6ac5 ec11 8b0e .:.8.b..(Wj.....
+ 0x0080: 6b30 92a5 7ccc 720b k0..|.r.
+
+Disabling the encryption on the link by removing ``security encrypt`` will show
+the unencrypted but authenticated content.
+
+.. code-block:: none
+
+ 17:37:00.746155 00:50:56:bf:ef:aa > 00:50:56:b3:ad:d6, ethertype Unknown (0x88e5), length 150:
+ 0x0000: 2000 0000 0009 0050 56bf efaa 0001 86dd .......PV.......
+ 0x0010: 6009 86f3 0040 3a40 2001 0db8 0000 0000 `....@:@........
+ 0x0020: 0000 0000 0000 0001 2001 0db8 0000 0000 ................
+ 0x0030: 0000 0000 0000 0002 8100 d977 0f30 0003 ...........w.0..
+ 0x0040: 1ca0 c65e 0000 0000 8d93 0b00 0000 0000 ...^............
+ 0x0050: 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f ................
+ 0x0060: 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f .!"#$%&'()*+,-./
+ 0x0070: 3031 3233 3435 3637 87d5 eed3 3a39 d52b 01234567....:9.+
+ 0x0080: a282 c842 5254 ef28 ...BRT.(
+
diff --git a/docs/interfaces/pppoe.rst b/docs/interfaces/pppoe.rst
index 73012619..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
@@ -220,10 +228,6 @@ Operation
TX: bytes packets errors dropped carrier collisions
533822843 1620173 0 0 0 0
-.. opcmd:: show interfaces pppoe <interface> log
-
- Displays log information for a PPPoE interface.
-
.. opcmd:: show interfaces pppoe <interface> queue
Displays queue information for a PPPoE interface.
@@ -320,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
diff --git a/docs/services/mdns-repeater.rst b/docs/services/mdns-repeater.rst
index d211aa50..9d6a292a 100644
--- a/docs/services/mdns-repeater.rst
+++ b/docs/services/mdns-repeater.rst
@@ -5,7 +5,7 @@ Starting with VyOS 1.2 a :abbr:`mDNS (Multicast DNS)` repeater functionality is
provided. Additional information can be obtained from
https://en.wikipedia.org/wiki/Multicast_DNS.
-Multicast DNS uses the 224.0.0.51 address, which is "administratively scoped"
+Multicast DNS uses the 224.0.0.251 address, which is "administratively scoped"
and does not leave the subnet. It retransmits mDNS packets from one interface
to other interfaces. This enables support for e.g. Apple Airplay devices across
multiple VLANs.
diff --git a/docs/system/serial-console.rst b/docs/system/serial-console.rst
index 309c6ad2..d65d65fe 100644
--- a/docs/system/serial-console.rst
+++ b/docs/system/serial-console.rst
@@ -38,6 +38,10 @@ Major upgrades to the installed distribution may also require console access.
* ``57600`` - 57,600 bps
* ``115200`` - 115,200 bps (default for serial console)
+ .. note:: If you use a USB to serial converter please note that most of them
+ use software emulation without flow control, thus you should start with a
+ common baud rate of 9600 as otherwise you could get
+
###############
Network Console
###############