New upstream version 1.39.90 upstream/1.39.90

1 files changed, 12 insertions, 13 deletions

diff --git a/examples/nm-conf.d/30-anon.conf b/examples/nm-conf.d/30-anon.conf
index c523063b..880129ca 100644
--- a/examples/nm-conf.d/30-anon.conf
+++ b/examples/nm-conf.d/30-anon.conf
@@ -11,16 +11,15 @@
 # a per-connection override.
 # That means, if the connection profile has
 #
-#   $ nmcli connection show "$CON_NAME" |
-#       grep '^\(connection.stable-id\|ipv6.addr-gen-mode\|ipv6.ip6-privacy\|802-11-wireless.cloned-mac-address\|802-11-wireless.mac-address-randomization\|802-3-ethernet.cloned-mac-address\|ipv4.dhcp-client-id\|ipv6.dhcp-duid\)'
-#   connection.stable-id:                   --
-#   802-3-ethernet.cloned-mac-address:      --
-#   802-11-wireless.cloned-mac-address:     --
-#   802-11-wireless.mac-address-randomization:default
-#   ipv4.dhcp-client-id:                    --
-#   ipv6.ip6-privacy:                       -1 (unknown)
-#   ipv6.addr-gen-mode:                     stable-privacy
-#   ipv6.dhcp-duid:                         --
+#   $ nmcli -f 'connection.stable-id,802-11-wireless.cloned-mac-address,802-11-wireless.mac-address-randomization,802-3-ethernet.cloned-mac-address,ipv4.dhcp-client-id,ipv6.addr-gen-mode,ipv6.dhcp-duid,ipv6.ip6-privacy' connection show "$CON_NAME"
+#   connection.stable-id:                      --
+#   802-11-wireless.cloned-mac-address:        --
+#   802-11-wireless.mac-address-randomization: default
+#   802-3-ethernet.cloned-mac-address:         --
+#   ipv4.dhcp-client-id:                       --
+#   ipv6.addr-gen-mode:                        stable-privacy
+#   ipv6.dhcp-duid:                            --
+#   ipv6.ip6-privacy:                          -1 (unknown)
 #
 # then the default values are inherited and thus both the MAC
 # address, IPv6 host identifier, and DHCP identifiers are randomized.
@@ -50,10 +49,10 @@
 #
 #   $ nmcli connection modify "$CON_NAME" connection.stable-id 'my-home-wifi yada yada/${BOOT}'
 
-[device-anon]
+[device-30-anon]
 wifi.scan-rand-mac-address=yes
 
-[connection-anon]
+[connection-30-anon]
 connection.stable-id=${RANDOM}
 ethernet.cloned-mac-address=stable
 wifi.cloned-mac-address=stable
@@ -67,7 +66,7 @@ ipv6.ip6-privacy=2
 #   ipv4.dhcp-client-id=mac
 #   ipv6.dhcp-duid=ll
 # In case, the interface cannot use MAC address randomization,
-# RFC 7844 recomments
+# RFC 7844 recommends
 #   connection.stable-id=${RANDOM}
 #   ipv4.dhcp-client-id=stable
 #   ipv6.dhcp-duid=stable-llt