Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:update-docs into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 3c8c77260a86470d37bec5f2cf9730e3719c4a45
Merged at revision: 60c38868f4747bf88a684a45009d9516353fcf1f
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:update-docs
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target: 789 lines (+306/-140)
20 files modified
dev/null (+0/-47)
docs/configure-a-shared-connection.md (+27/-0)
docs/configure-cellular-connections.md (+23/-13)
docs/configure-wifi-access-points.md (+24/-0)
docs/configure-wifi-connections.md (+2/-2)
docs/edit-connections.md (+4/-4)
docs/faq.md (+4/-3)
docs/index.md (+13/-12)
docs/installation.md (+54/-24)
docs/logging-messages.md (+4/-4)
docs/metadata.yaml (+10/-4)
docs/networkmanager-and-netplan.md (+31/-0)
docs/reference/available-commands.md (+12/-0)
docs/reference/dbus-api.md (+1/-1)
docs/reference/snap-configuration/connectivity-check.md (+28/-0)
docs/reference/snap-configuration/debug.md (+2/-2)
docs/reference/snap-configuration/default_renderer.md (+18/-0)
docs/reference/snap-configuration/wifi-powersave.md (+1/-1)
docs/reference/snap-configuration/wowlan.md (+3/-3)
docs/release-notes.md (+45/-20)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato continuous-integration Approve
System Enablement Bot continuous-integration Needs Fixing
Review via email: mp+387195@code.launchpad.net

Commit message

* core/pppd-plugin: wait to recover port settings before notifying death
  See code branch MP:
  https://code.launchpad.net/~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager/+merge/387041
* docs: update to reflect current state

Description of the change

* core/pppd-plugin: wait to recover port settings before notifying death
  See code branch MP:
  https://code.launchpad.net/~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager/+merge/387041
* docs: update to reflect current state

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 3c8c77260a86470d37bec5f2cf9730e3719c4a45

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1337/

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/docs/configure-a-shared-connection.md b/docs/configure-a-shared-connection.md
0new file mode 1006440new file mode 100644
index 0000000..61cbe87
--- /dev/null
+++ b/docs/configure-a-shared-connection.md
@@ -0,0 +1,27 @@
1---
2title: "Configure shared connections"
3table_of_contents: True
4---
5
6# Configure shared connections
7
8NetworkManager makes very easy to share connectivity, using the device
9as a gateway to which other devices can connect. That requires running
10commands similar to
11
12```
13$ nmcli c add con-name <name> type ethernet ifname <iface> ipv4.method shared ipv6.method ignore
14$ nmcli c up <name>
15```
16
17where `<name>` is an arbitrary name we give to the connection and
18`<iface>` is the name of the interface where external devices will
19connect to. In this case we are using an ethernet interface
20(`type ethernet`) and we provide IPv4 addresses, but this extends to other
21interfaces and to IPv6.
22
23When the connection is up, NM starts a DHCP server listening on
24`<iface>` and changes the networking configuration so we can forward
25packages and masquerading is enabled for the interface. Of course, for
26this to work we need an interface different from `<iface>` that has
27to have external connectivity.
diff --git a/docs/configure-cellular-connections.md b/docs/configure-cellular-connections.md
index 215f2dc..b2ad22b 100644
--- a/docs/configure-cellular-connections.md
+++ b/docs/configure-cellular-connections.md
@@ -5,6 +5,11 @@ table_of_contents: False
55
6# Configure Cellular Connections6# Configure Cellular Connections
77
8For cellular connections, first install the modem-manager snap with:
9```
10$ snap install modem-manager
11```
12
8Check whether a modem was properly detected via:13Check whether a modem was properly detected via:
914
10```15```
@@ -15,7 +20,7 @@ Found 1 modems:
1520
16In this case we have just one modem, with index 0 (the number at the end of the DBus object path).21In this case we have just one modem, with index 0 (the number at the end of the DBus object path).
1722
18Show detailed information about the modem:23Show detailed information about the modem using that index:
1924
20```25```
21$ sudo modem-manager.mmcli -m 026$ sudo modem-manager.mmcli -m 0
@@ -86,15 +91,20 @@ $ nmcli c add type gsm ifname <interface> con-name <name> apn <operator_apn>
86$ nmcli r wwan on91$ nmcli r wwan on
87```92```
8893
89where &lt;interface&gt; is the string listed as “primary port” in the output from 'sudo mmcli -m &lt;N&gt;'94where &lt;interface&gt; is the string listed as “primary port” in the
90(as previously described),95output from `sudo mmcli -m <N>` (as previously described),
91&lt;name&gt; is an arbitrary name used to identify the connection, and &lt;operator_apn&gt; is96&lt;name&gt; is an arbitrary name used to identify the connection, and
92the APN name for your cellular data plan. Note that &lt;interface&gt; is usually a serial97&lt;operator_apn&gt; is the APN name for your cellular data plan.
93port with pattern /dev/tty*, not a networking interface. The reason for ModemManager98Note that &lt;interface&gt; is usually a serial port with pattern
94to use that instead of the networking interface is that this last one can appear/disappear99tty\* or a cdc-wdm\* device, not a networking interface. As these
95dynamically while the ports do not if the hardware configuration remains unchanged.100interface names might change depending on the devices present in the
96For instance, the networking interface can be ppp0, ppp1, etc., and it might be101system, a better alternative is to use the sysfs path shown by mmcli
97different each time it is possible to have other ppp connections with, say, VPNs.102(device: ...) or use `'*'`, which will use any modem device detected
103by MM:
104
105```
106sudo nmcli c add type gsm ifname '*' con-name <name> apn <operator_apn>
107```
98108
99After executing these commands, NetworkManager will automatically try to bring up109After executing these commands, NetworkManager will automatically try to bring up
100the cellular connection whenever ModemManager reports that the modem has110the cellular connection whenever ModemManager reports that the modem has
@@ -115,9 +125,9 @@ $ nmcli c modify <name> connection.autoconnect [yes|no]
115$ nmcli c down <name>125$ nmcli c down <name>
116```126```
117127
118Finally, note that we can provide the PIN (so it is entered automatically) or more128Finally, note that we can provide the PIN (so it is entered
119needed APN provisioning information when creating/modifying the WWAN connection.129automatically) or additional APN provisioning information when
120For instance:130creating/modifying the WWAN connection. For instance:
121131
122```132```
123$ nmcli c add type gsm ifname <interface> con-name <name> apn <operator_apn> username <user> password <password> pin <PIN>133$ nmcli c add type gsm ifname <interface> con-name <name> apn <operator_apn> username <user> password <password> pin <PIN>
diff --git a/docs/configure-wifi-access-points.md b/docs/configure-wifi-access-points.md
124new file mode 100644134new file mode 100644
index 0000000..a87c517
--- /dev/null
+++ b/docs/configure-wifi-access-points.md
@@ -0,0 +1,24 @@
1---
2title: "Configure WiFi Access Points"
3table_of_contents: True
4---
5
6# Configure WiFi Access Points
7
8It is possible to create WiFi Access Points with the network-manager snap.
9This can be done by running
10
11```
12$ nmcli d wifi hotspot ifname <wifi_iface> ssid <ssid> password <password>
13```
14
15where `<wifi_iface>` is the wifi network interface, `<ssid>` is the
16SSID for the AP that we are creating and that will be visible to
17devices connecting to it, and `<password>` is the access password
18(that needs to have between 8-63 characters or 64 hexadecimal
19characters). NM will create a connection called '`Hotspot <N>`' if
20the command is successful.
21
22The created AP offers by default a shared connection, so devices
23connected to it should be able to access the Internet if the device
24providing the AP has access too.
diff --git a/docs/configure-wifi-connections.md b/docs/configure-wifi-connections.md
index 4602dfd..aab3f9f 100644
--- a/docs/configure-wifi-connections.md
+++ b/docs/configure-wifi-connections.md
@@ -6,11 +6,11 @@ table_of_contents: True
6# Configure WiFi Connections6# Configure WiFi Connections
77
8This section explains how to establish a WiFi connection. It covers creating and8This section explains how to establish a WiFi connection. It covers creating and
9modyfying connections as well as directly connecting.9modifying connections as well as directly connecting.
1010
11## Establish a Wireless Connection11## Establish a Wireless Connection
1212
13This section will show how to establish a wifi connection to the wireles13This section will show how to establish a wifi connection to the wireless
14network. Note that directly connecting will implicitly create a connection (that14network. Note that directly connecting will implicitly create a connection (that
15can be seen with "nmcli c"). The naming of such will follow "SSID N" pattern,15can be seen with "nmcli c"). The naming of such will follow "SSID N" pattern,
16where N is a number.16where N is a number.
diff --git a/docs/edit-connections.md b/docs/edit-connections.md
index 0c9d087..15eadec 100644
--- a/docs/edit-connections.md
+++ b/docs/edit-connections.md
@@ -5,9 +5,9 @@ table_of_contents: True
55
6# Edit Connections6# Edit Connections
77
8This part will show you how to use a network-manager built-in editor to modify8This section shows how to use the network-manager built-in editor to
9the connections as well as provide a reference for setting some of the9modify connections as well as provide a reference for changing some of
10settings.10the settings.
1111
12## Using nmcli Console12## Using nmcli Console
1313
@@ -88,7 +88,7 @@ IPv4 and IPv6 settings.
8888
89It is important to understand that every option can be modified using either the89It is important to understand that every option can be modified using either the
90command-line or the editor. The advantage of the editor is that it shows which90command-line or the editor. The advantage of the editor is that it shows which
91options are availabe for modification in contrast to the command-line which does91options are available for modification in contrast to the command-line which does
92not.92not.
9393
94It is possible however to learn about the available settings from the94It is possible however to learn about the available settings from the
diff --git a/docs/enable-ethernet-support.md b/docs/enable-ethernet-support.md
95deleted file mode 10064495deleted file mode 100644
index 1aebf45..0000000
--- a/docs/enable-ethernet-support.md
+++ /dev/null
@@ -1,38 +0,0 @@
1---
2title: "Enable Ethernet Support"
3table_of_contents: False
4---
5
6# Enable Ethernet Support
7
8The default netplan configuration files in Ubuntu Core leave management of
9Ethernet devices to networkd. Therefore, to avoid conflicts, the
10network-manager snap does not manage Ethernet devices by default. The user has
11to take care to enable it after installation if desired.
12
13## Configure System for Ethernet Support
14
15Before following the instructions below, backup the contents of /etc/netplan to
16be able to restore it at a later point.
17
18Also, note that this change might lead to a system without properly configured
19network connections, which would lead to problems accessing the device, so be
20careful when doing this.
21
22To enable ethernet support, you have to set the `ethernet.enable` property to
23`true`. See how to do this [here](reference/configuration/ethernet_support.md).
24When this is done, configuration files for netplan are created so
25network-manager is the default netplan renderer. When set to `false` (the
26default), the NM snap explicitly disables the management of ethernet devices to
27avoid conflicts with networkd.
28
29Rebooting the system will be needed for the changes to take effect.
30
31After the reboot, NetworkManager should automatically set up attached Ethernet
32ports or use existing netplan configuration files to setup connections.
33
34Once logged into the system you may check the current connection status by
35
36```
37$ nmcli c show
38```
diff --git a/docs/faq.md b/docs/faq.md
index ede5b21..e84de9d 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -12,7 +12,8 @@ to provide solutions for them.
1212
13### Possible cause: Ethernet support is disabled for NetworkManager13### Possible cause: Ethernet support is disabled for NetworkManager
1414
15By default the network-manager snap disables Ethernet support to avoid conflicts15The core16 based network-manager snap (1.2.2 version) disables by default
16with networkd/netplan which are used by default on Ubuntu Core 16. See16ethernet support to avoid conflicts
17*[Enable Ethernet Support](enable-ethernet-support.md)* for details on how to17with networkd/netplan. See
18*[NetworkManager and netplan](networkmanager-and-netplan.md)* for details on how to
18enable it.19enable it.
diff --git a/docs/index.md b/docs/index.md
index 81dcc30..6909fc2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,31 +6,32 @@ table_of_contents: False
6# About NetworkManager6# About NetworkManager
77
8NetworkManager is a system network service that manages your network8NetworkManager is a system network service that manages your network
9devices and connections, attempts to keep network connectivity active9devices and connections and attempts to keep network connectivity active
10when available. It manages Ethernet, WiFi, mobile broadband (WWAN) and10when available. It manages Ethernet, WiFi, mobile broadband (WWAN) and
11PPPoE devices while also providing VPN integration with a variety of11PPPoE devices while also providing VPN integration with a variety of
12different VPN serivces.12different VPN services.
1313
14By default network management on [Ubuntu Core](https://www.ubuntu.com/core) is14By default network management on [Ubuntu
15handled by systemd's15Core](https://www.ubuntu.com/core) is handled by systemd's
16[networkd](https://www.freedesktop.org/software/systemd/man/systemd-networkd.service.html)16[networkd](https://www.freedesktop.org/software/systemd/man/systemd-networkd.service.html)
17and [netplan](https://launchpad.net/netplan). While NetworkManager has some17and [netplan](https://launchpad.net/netplan). However, when
18support to handle netplan configuration files, Ethernet support is disabled by18NetworkManager is installed, it will take control of all networking
19default and has to be turned on explicitly to avoid conflicts with existing19devices in the system by creating a netplan configuration file in which
20network configuration.20it sets itself as the default network renderer.
2121
22## What NetworkManager Offers22## What NetworkManager Offers
2323
24The upstream NetworkManager project offers a wide range of features which are24The upstream NetworkManager project offers a wide range of features and
25partially available in the snap version. However,25most, but not all of them, are available in the snap package at the
26as the snap should be always delivered in high quality we don't have yet all26moment.
27upstream features enabled.
2827
29Currently we provide support for the following high level features:28Currently we provide support for the following high level features:
3029
31 * WiFi connectivity30 * WiFi connectivity
32 * WWAN connectivity (together with ModemManager)31 * WWAN connectivity (together with ModemManager)
33 * Ethernet connectivity32 * Ethernet connectivity
33 * WiFi access point creation
34 * Shared connections
3435
35 Currently we do not support the following features:36 Currently we do not support the following features:
3637
diff --git a/docs/installation.md b/docs/installation.md
index b031d79..c2d2a6a 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -5,7 +5,7 @@ table_of_contents: True
55
6# Install NetworkManager6# Install NetworkManager
77
8The NetworkManager snap is currently available from the Ubuntu Store. It can8The NetworkManager snap is currently available from the Snap Store. It can
9be installed on any system that supports snaps but is only recommended on9be installed on any system that supports snaps but is only recommended on
10[Ubuntu Core](https://www.ubuntu.com/core) at the moment.10[Ubuntu Core](https://www.ubuntu.com/core) at the moment.
1111
@@ -13,49 +13,79 @@ You can install the snap with the following command:
1313
14```14```
15 $ snap install network-manager15 $ snap install network-manager
16 network-manager 1.2.2-10 from 'canonical' installed16 network-manager (1.10/stable) 1.10.6-7 from Canonical✓ installed
17```
1817
19Although the network-manager snap is available from other channels (candidate, beta, edge),18```
20only the stable version should be used for production devices. Their meaning is internal
21to the development team of the network-manager snap.
2219
23All necessary plugs and slots will be automatically connected within the20All necessary plugs and slots will be automatically connected within the
24installation process. You can verify this with:21installation process. You can verify this with:
2522
26```23```
27$ snap interfaces network-manager24$ snap connections network-manager
28Slot Plug25Interface Plug Slot Notes
29:network-setup-observe network-manager26dbus network-manager:wpa - -
30:ppp network-manager27firewall-control network-manager:firewall-control :firewall-control -
31network-manager:service network-manager:nmcli28hardware-observe network-manager:hardware-observe :hardware-observe -
32- network-manager:modem-manager29login-session-observe network-manager:login-session-observe :login-session-observe -
30modem-manager network-manager:modem-manager modem-manager:service -
31network network-manager:network :network -
32network-manager network-manager:nmcli network-manager:service -
33network-observe network-manager:network-observe :network-observe -
34network-setup-control network-manager:network-setup-control :network-setup-control -
35network-setup-observe network-manager:network-setup-observe :network-setup-observe -
36ppp network-manager:ppp :ppp -
37
33```38```
3439
35**NOTE:** The _network-manager:modem-manager_ plug only gets connected when the40**NOTE:** The _network-manager:modem-manager_ plug only gets connected
36_modem-manager_ snap is installed too. Otherwise it stays disconnected.41when the _modem-manager_ snap is installed too. Otherwise it stays
42disconnected. Similarly, there is a _network-manager:wpa_ plug in case
43we would want to use a custom wpa supplicant snap instead of the one
44supplied by the core snap (this is not generally recommended).
3745
38Once the installation has successfully finished the46Once the installation has successfully finished the NetworkManager
39NetworkManager service is running in the background. You can check its current47service is running in the background. You can check its current status
40status with48with
4149
42```50```
43 $ systemctl status snap.networkmanager51 $ systemctl status snap.network-manager.networkmanager.service
44 ● snap.networkmanager.service - Service for snap application networkmanager52 ● snap.network-manager.networkmanager.service - Service for snap application network-manager.networkmanager
45 Loaded: loaded (/etc/systemd/system/snap.networkmanager.service; enabled; vendor preset: enabled)53 Loaded: loaded (/etc/systemd/system/snap.network-manager.networkmanager.service; enabled; vendor preset: enabled)
46 Active: active (running) since Thu 2017-02-16 09:59:39 UTC; 16s ago54 Active: active (running) since Thu 2020-07-09 10:19:01 UTC; 6min ago
47 Main PID: 1389 (networkmanager)55 Main PID: 2850 (NetworkManager)
48 [...]56 Tasks: 3 (limit: 569)
57 CGroup: /system.slice/snap.network-manager.networkmanager.service
58 └─2850 /snap/network-manager/564/usr/sbin/NetworkManager --config-dir=/var/snap/network-manager/564/conf.d/ --config=/snap/network-manager/564/etc/NetworkManager/NetworkManager.conf --log-level=INFO --no-daemon
49```59```
5060
51Now you have NetworkManager successfully installed.61Now you have NetworkManager successfully installed.
5262
63## network-manager tracks and channels
64
65The network-manager snap has currently three tracks:
66
67 * **20**: Contains upstream 1.22.10 and has a core20 base. The track name refers
68 to the base snap and it is the convention being used at the moment.
69 * **1.10**: Contains upstream 1.10.6 and has a core18 base. Nowadays, this is the one
70 installed by default if the channel is not specified when running `snap install`.
71 The track name refers to the upstream version. More modern releases have changed
72 the convention so the track now refers to the base snap.
73 * **latest**: Contains upstream 1.2.2 and has a core16 base. Despite the unfortunate
74 name (there are historical reasons for that) it is the oldest version.
75
76All these tracks are available with the usual risks: stable,
77candidate, beta, and edge, but only the stable version should be used
78for production devices. The meaning of the other risk levels is
79internal to the development team of the network-manager snap.
80
53## Next Steps81## Next Steps
5482
55 * [Enable Ethernet Support](enable-ethernet-support.md)83 * [NetworkManager and netplan](networkmanager-and-netplan.md)
56 * [Explore Network Status](explore-network-status.md)84 * [Explore Network Status](explore-network-status.md)
57 * [Configure WiFi Connections](configure-wifi-connections.md)85 * [Configure WiFi Connections](configure-wifi-connections.md)
86 * [Configure WiFi Access Points](configure-wifi-access-points.md)
58 * [Configure Cellular Connections](configure-cellular-connections.md)87 * [Configure Cellular Connections](configure-cellular-connections.md)
88 * [Configure shared connections](configure-a-shared-connection.md)
59 * [Edit Network Connections](edit-connections.md)89 * [Edit Network Connections](edit-connections.md)
60 * [Routing Tables](routing-tables.md)90 * [Routing Tables](routing-tables.md)
61 * [Logging Messages](logging-messages.md)91 * [Logging Messages](logging-messages.md)
diff --git a/docs/logging-messages.md b/docs/logging-messages.md
index d242808..5dd4679 100644
--- a/docs/logging-messages.md
+++ b/docs/logging-messages.md
@@ -5,10 +5,10 @@ table_of_contents: False
55
6# Logging Messages6# Logging Messages
77
8This section will show how to modify the logging levels by NetworkManager.8This section shows how to modify the logging levels by NetworkManager.
99
10NetworkManager supports on the fly changing of the logging levels and allows for10NetworkManager supports on the fly changing of the logging levels and allows for
11a fine control over what is logged.11a fine grained control over what is logged.
1212
13First check what is the current logging setup, type:13First check what is the current logging setup, type:
1414
@@ -34,10 +34,10 @@ $ nmcli general logging [level <level> [domain <domain>]]
34The &lt;level&gt; is the desired log level. You can choose from the following:34The &lt;level&gt; is the desired log level. You can choose from the following:
3535
36* **ERR:** will log only critical errors36* **ERR:** will log only critical errors
37* **WARN:** will log warnin messages37* **WARN:** will log warning messages
38* **INFO:** will log various informational messages38* **INFO:** will log various informational messages
39* **DEBUG:** enables verbose logging for debugging purposes39* **DEBUG:** enables verbose logging for debugging purposes
4040
41&lt;domain&gt; is the category of messages that shall be logged with given41&lt;domain&gt; is the category of messages that shall be logged with given
42severity. **WIFI** will include only WiFi related messages, **IP4** will include42severity. **WIFI** will include only WiFi related messages, **IP4** will include
43only IPv4 related messages and so on..43only IPv4 related messages, and so on.
diff --git a/docs/metadata.yaml b/docs/metadata.yaml
index 82bf35f..12c634a 100644
--- a/docs/metadata.yaml
+++ b/docs/metadata.yaml
@@ -13,10 +13,14 @@ navigation:
13 location: explore-network-status.md13 location: explore-network-status.md
14 - title: Configure WiFi Connections14 - title: Configure WiFi Connections
15 location: configure-wifi-connections.md15 location: configure-wifi-connections.md
16 - title: Configure WiFi Access Points
17 location: configure-wifi-access-points.md
16 - title: Configure Cellular Connections18 - title: Configure Cellular Connections
17 location: configure-cellular-connections.md19 location: configure-cellular-connections.md
18 - title: Enable Ethernet Support20 - title: Configure shared connections
19 location: enable-ethernet-support.md21 location: configure-a-shared-connection.md
22 - title: NetworkManager and netplan
23 location: networkmanager-and-netplan.md
20 - title: Edit Connections24 - title: Edit Connections
21 location: edit-connections.md25 location: edit-connections.md
22 - title: Routing Tables26 - title: Routing Tables
@@ -27,10 +31,12 @@ navigation:
27 children:31 children:
28 - title: Snap Configuration32 - title: Snap Configuration
29 children:33 children:
30 - title: Ethernet Support34 - title: Default renderer
31 location: reference/configuration/ethernet_support.md35 location: reference/snap-configuration/default_renderer.md
32 - title: Debug36 - title: Debug
33 location: reference/snap-configuration/debug.md37 location: reference/snap-configuration/debug.md
38 - title: Connectivity check
39 location: reference/snap-configuration/connectivity-check.md
34 - title: Wake on WLAN40 - title: Wake on WLAN
35 location: reference/snap-configuration/wowlan.md41 location: reference/snap-configuration/wowlan.md
36 - title: WiFi Powersave42 - title: WiFi Powersave
diff --git a/docs/networkmanager-and-netplan.md b/docs/networkmanager-and-netplan.md
37new file mode 10064443new file mode 100644
index 0000000..9f34e88
--- /dev/null
+++ b/docs/networkmanager-and-netplan.md
@@ -0,0 +1,31 @@
1---
2title: "NetworkManager and netplan"
3table_of_contents: False
4---
5
6# NetworkManager and netplan
7
8The default netplan configuration files in Ubuntu Core leave
9management of networking devices to networkd. But, when
10network-manager is installed, it creates new netplan configuration
11files, setting itself as the default network renderer and taking
12control of all devices.
13
14It is possible to control this behavior with the `defaultrenderer`
15snap option. It is set by default to `true`, but if we set it to
16`false`, network-manager reverts the netplan configuration and
17networkd takes control of the devices again. Note however that
18networkd will take control only of devices explicitly configured by
19netplan configuration files, which is usually only ethernet or wifi
20devices. To do that:
21
22```
23snap set network-manager defaultrenderer=false
24```
25
26In the core16 snap (legacy), the behavior was different: networkd was
27left as default renderer and the default netplan configuration was
28unchanged when network-manager was installed. There was instead a
29setting called `ethernet.enable` that was `false` by default. When set
30to `true`, NetworkManager was set as the default network renderer
31similarly as described above.
diff --git a/docs/reference/available-commands.md b/docs/reference/available-commands.md
index 18b3cec..b774403 100644
--- a/docs/reference/available-commands.md
+++ b/docs/reference/available-commands.md
@@ -17,3 +17,15 @@ NetworkManager service.
1717
18An explanatory description of the command and available options are available18An explanatory description of the command and available options are available
19[here](https://developer.gnome.org/NetworkManager/1.2/nmcli.html)19[here](https://developer.gnome.org/NetworkManager/1.2/nmcli.html)
20
21## network-manager.nmtui
22
23nmtui is the Network Manager Text User Interface. It is a curses-based application
24that allows easy configuration of connections and networking settings. Besides
25network-manager.nmtui, these other three commands are available:
26
27* network-manager.nmtui-edit
28* network-manager.nmtui-connect
29* network-manager.nmtui-hostname
30
31More details can be found in the [manual page](https://developer.gnome.org/NetworkManager/stable/nmtui.html).
diff --git a/docs/reference/configuration/ethernet_support.md b/docs/reference/configuration/ethernet_support.md
20deleted file mode 10064432deleted file mode 100644
index fbc5929..0000000
--- a/docs/reference/configuration/ethernet_support.md
+++ /dev/null
@@ -1,47 +0,0 @@
1---
2title: Ethernet Support
3table_of_contents: true
4---
5
6# Ethernet Support
7
8*Available since:* 1.2.2-12
9
10The NetworkManager snap provides a configuration option to adjust
11if it should manage ethernet network connections.
12
13By default the NetworkManager snap **does not** manage ethernet network
14devices as it would conflict with the default network management in
15Ubuntu Core which is handled by [netplan](https://launchpad.net/netplan) and
16[networkd](https://www.freedesktop.org/software/systemd/man/systemd-networkd.service.html).
17
18## Enable Ethernet Support
19
20To enable management of ethernet network devices the snap provides the
21*ethernet.enable* configuration option.
22
23This configuration option accepts the following values
24
25 * **false (default):** Ethernet support is disabled. All network
26 devices matching the expression 'en*' or 'eth*' will be ignored.
27 * **true:** All ethernet devices available on the system will be
28 managed by NetworkManager. networkd will not manage any of these
29 anymore.
30
31Changing the *ethernet* configuration option needs a reboot of the
32device it's running on.
33
34After the device has rebooted ethernet support is enabled NetworkManager will
35take over management of all available ethernet network devices on the device.
36
37NetworkManager will reuse existing configurations files from */etc/netplan*
38when ethernet support is enabled. Those will marked as immutable inside
39NetworkManager and any changes need to be written manually into the relevant
40files in */etc/netplan*.
41
42Example:
43
44```
45 $ snap set network-manager ethernet.enable=true
46 $ sudo reboot
47```
diff --git a/docs/reference/dbus-api.md b/docs/reference/dbus-api.md
index 7cece10..cc7b7f0 100644
--- a/docs/reference/dbus-api.md
+++ b/docs/reference/dbus-api.md
@@ -6,4 +6,4 @@ table_of_contents: False
6# DBUS API6# DBUS API
77
8Documentation of the DBus API is provided by the NetworkManager upstream project8Documentation of the DBus API is provided by the NetworkManager upstream project
9[here](https://developer.gnome.org/NetworkManager/1.2/spec.html).9[here](https://developer.gnome.org/NetworkManager/stable/spec.html).
diff --git a/docs/reference/snap-configuration/connectivity-check.md b/docs/reference/snap-configuration/connectivity-check.md
10new file mode 10064410new file mode 100644
index 0000000..c68cbe4
--- /dev/null
+++ b/docs/reference/snap-configuration/connectivity-check.md
@@ -0,0 +1,28 @@
1---
2title: Connectivity check
3table_of_contents: true
4---
5
6# Connectivity check
7
8Connectivity checking is a NetworkManager functionality that allows
9periodically testing whether the system can actually access the
10internet or not. The network-manager snap allows configuring this
11feature by using the following snap settings:
12
13* **connectivity.interval**: it specifies the number of seconds between checks.
14 If set to 0, it disables connectivity check. Set to 300 by default.
15* **connectivity.response**: This is the expected HTTP body response from the server
16 specified by connectivity.uri.
17* **connectivity.uri**: The URI where NM is going to periodically access to check connectivity.
18
19More details on how these options work can be found in the connectivity section of
20the [NetworkManager.conf configuration file documentation](https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html).
21
22Some example commands on how to set a check every three minutes using the
23Ubuntu connectivity check server are
24
25```
26$ snap set network-manager connectivity.uri=http://connectivity-check.ubuntu.com/
27$ snap set network-manager connectivity.interval=180
28```
diff --git a/docs/reference/snap-configuration/debug.md b/docs/reference/snap-configuration/debug.md
index e16d17c..1e54976 100644
--- a/docs/reference/snap-configuration/debug.md
+++ b/docs/reference/snap-configuration/debug.md
@@ -9,7 +9,7 @@ Debug is a feature that controls the amount of logs produced by the network-mana
9snap. It is useful for collecting information required to either report a bug or9snap. It is useful for collecting information required to either report a bug or
10investigate a network-manager failure (if happens).10investigate a network-manager failure (if happens).
1111
12It is disabled by default and has to be explicitely turned on for usage.12It is disabled by default and has to be explicitly turned on for usage.
1313
14Note that the debug logs may contain sensitive information.14Note that the debug logs may contain sensitive information.
1515
@@ -47,5 +47,5 @@ The debug information, when enabled, will be available in the journal and can
47be viewed with:47be viewed with:
4848
49```49```
50$ journalctl --no-pager -u snap.network-manager.networkmanager.service50$ journalctl --no-pager -l -u snap.network-manager.networkmanager.service
51```51```
diff --git a/docs/reference/snap-configuration/default_renderer.md b/docs/reference/snap-configuration/default_renderer.md
52new file mode 10064452new file mode 100644
index 0000000..a50ca48
--- /dev/null
+++ b/docs/reference/snap-configuration/default_renderer.md
@@ -0,0 +1,18 @@
1---
2title: Default renderer
3table_of_contents: true
4---
5
6# Default renderer
7
8The NetworkManager snap provides a configuration option,
9`defaultrenderer`, to adjust if it should be the default network
10renderer or not. By default, it is set to `true`. To change it:
11
12```
13snap set network-manager defaultrenderer=false
14```
15
16For the core16 snap, there is an option called `ethernet.enable` that
17does basically the same. See the [NetworkManager and netplan](../../networkmanager-and-netplan.md)
18section for more details.
diff --git a/docs/reference/snap-configuration/wifi-powersave.md b/docs/reference/snap-configuration/wifi-powersave.md
index 8b9e68f..1958697 100644
--- a/docs/reference/snap-configuration/wifi-powersave.md
+++ b/docs/reference/snap-configuration/wifi-powersave.md
@@ -7,7 +7,7 @@ table_of_contents: True
77
8WiFi Powersave is a feature that allows a device to suspend its radio activity8WiFi Powersave is a feature that allows a device to suspend its radio activity
9after a fixed period of inactivity. The device remains idle for a fixed time,9after a fixed period of inactivity. The device remains idle for a fixed time,
10usualy about 100ms, and once it is reached it wakes up to check if the10usually about 100ms, and once it is reached it wakes up to check if the
11infrastructure has any packets queued up for it.11infrastructure has any packets queued up for it.
1212
13The NetworkManager snap allows to configure this option by either enabling or13The NetworkManager snap allows to configure this option by either enabling or
diff --git a/docs/reference/snap-configuration/wowlan.md b/docs/reference/snap-configuration/wowlan.md
index 2ae0791..c4145af 100644
--- a/docs/reference/snap-configuration/wowlan.md
+++ b/docs/reference/snap-configuration/wowlan.md
@@ -8,7 +8,7 @@ table_of_contents: True
8*Available since:* 1.2.2-118*Available since:* 1.2.2-11
99
10Wake on WLAN (called WoWLAN in the following) is a feature which allows a device10Wake on WLAN (called WoWLAN in the following) is a feature which allows a device
11to be woken up from standby power states to faciliate device management. It is based11to be woken up from standby power states to facilitate device management. It is based
12on the well well-established standard for Wake on LAN. The functionality is not entirely12on the well well-established standard for Wake on LAN. The functionality is not entirely
13equivalent to Wake on LAN and there are some limitations.13equivalent to Wake on LAN and there are some limitations.
1414
@@ -53,7 +53,7 @@ This configuration option accepts the following values:
53 The content of the magic packet can be extended with the53 The content of the magic packet can be extended with the
54 wifi.wake-on-wlan-password option to require the client to send a54 wifi.wake-on-wlan-password option to require the client to send a
55 specific byte sequence functioning as a password so that not anyone55 specific byte sequence functioning as a password so that not anyone
56 unpriviledged can wake up the system.56 unprivileged can wake up the system.
57 * **gtk-rekey-failure:** A failure of a GTK rekey operation will cause the device to wake up.57 * **gtk-rekey-failure:** A failure of a GTK rekey operation will cause the device to wake up.
58 * **4way-handshake:** Reiteration of the 4way handshake will cause the device to wake up.58 * **4way-handshake:** Reiteration of the 4way handshake will cause the device to wake up.
59 * **rfkill-release:** Release of a rfkill will cause the device to wake up.59 * **rfkill-release:** Release of a rfkill will cause the device to wake up.
@@ -69,7 +69,7 @@ Example:
6969
70This configuration option accepts a textual value. If specified, the value will70This configuration option accepts a textual value. If specified, the value will
71be used in addition to the wireless device MAC address to function as a password71be used in addition to the wireless device MAC address to function as a password
72that disallows unpriviledged actors to wake up the device.72that disallows unprivileged actors to wake up the device.
7373
74Example:74Example:
7575
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 8a96cee..93de8d7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,31 +5,56 @@ table_of_contents: False
55
6# Release Notes6# Release Notes
77
8The version numbers mentioned on this page correspond to those released in the8You can check with the following command which version you have
9Ubuntu snap store.9currently installed:
10
11You can check with the following command which version you have currently
12installed:
1310
14```11```
15$ snap info network-manager12$ snap info network-manager
16name: network-manager13name: network-manager
17summary: "Network management based on NeworkManager"14summary: Network Manager
18publisher: canonical15publisher: Canonical✓
16store-url: https://snapcraft.io/network-manager
17contact: https://help.ubuntu.com/community/NetworkManager
18license: unset
19description: |19description: |
20 Network management of wired Ethernet, WiFi and mobile data connection based on20 NetworkManager is a system network service that manages your network
21 NetworkManager and ModemManager21 devices and connections, attempting to keep active network connectivity
22 when available. It manages ethernet, WiFi, mobile broadband (WWAN) and
23 PPPoE devices, provides VPN integration with a variety of different
24 VPN serivces.
25 Please find the source code for this track at:
26 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/+ref/snap-1.10
22commands:27commands:
23 - nmcli28 - network-manager.nmcli
24tracking: stable29 - network-manager.nmtui
25installed: 1.2.2-10 (73) 5MB -30 - network-manager.nmtui-connect
26[...]31 - network-manager.nmtui-edit
32 - network-manager.nmtui-hostname
33services:
34 network-manager.networkmanager: simple, enabled, active
35snap-id: RmBXKl6HO6YOC2DE4G2q1JzWImC04EUy
36tracking: 1.10/stable
37refresh-date: today at 10:18 UTC
38channels:
39 1.10/stable: 1.10.6-7 2020-06-29 (564) 4MB -
40 1.10/candidate: 1.10.6-7 2020-06-29 (564) 4MB -
41 1.10/beta: 1.10.6-7 2020-06-25 (564) 4MB -
42 1.10/edge: 1.10.6-5-dev 2020-04-06 (542) 4MB -
43 latest/stable: 1.2.2-25 2020-06-22 (554) 4MB -
44 latest/candidate: 1.2.2-25 2020-06-19 (554) 4MB -
45 latest/beta: 1.2.2-26 2020-07-07 (573) 4MB -
46 latest/edge: 1.2.2-26-dev 2020-07-07 (569) 4MB -
47 20/stable: –
48 20/candidate: –
49 20/beta: 1.22.10-1 2020-06-25 (561) 5MB -
50 20/edge: 1.22.10-2-dev 2020-07-08 (580) 5MB -
51installed: 1.10.6-7 (564) 4MB -
52
27```53```
28</br>
29## 1.2.2-11
3054
31 * Wake-on-WLAN can be configured via snap/nmcli55The detailed changelog for each revision can be consulted in the sources
32 * Automatic reconfiguration of network devices when device comes back from a56for each track:
33 low power state57
34 * Snap alias available for nmcli58* For track 20, [here](https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/ChangeLog?h=snap-20)
35 * WiFi powersave is configurable via snap configuration59* For track 1.10, [here](https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/ChangeLog?h=snap-1.10)
60* For track latest (note again this is not actually the more modern NM), [here](https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/ChangeLog)

Subscribers

People subscribed via source and target branches