diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /libnm/nm-property-infos-keyfile.xml | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'libnm/nm-property-infos-keyfile.xml')
| -rw-r--r-- | libnm/nm-property-infos-keyfile.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libnm/nm-property-infos-keyfile.xml b/libnm/nm-property-infos-keyfile.xml index 950a7790..0445d943 100644 --- a/libnm/nm-property-infos-keyfile.xml +++ b/libnm/nm-property-infos-keyfile.xml @@ -30,6 +30,8 @@ or semicolon separated list of 6 decimal bytes (obsolete)"/> </setting> <setting name="gsm"> </setting> +<setting name="hostname"> +</setting> <setting name="infiniband"> <property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01" description="MAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)"/> @@ -61,6 +63,8 @@ route2=7.7.0.0/16" description="List of IP routes."/> </setting> <setting name="ovs-dpdk"> </setting> +<setting name="ovs-external-ids"> +</setting> <setting name="ovs-interface"> </setting> <setting name="ovs-patch"> @@ -90,6 +94,8 @@ versions of NetworkManager stored this as an integer: 69 ('E') for eve </setting> <setting name="user"> </setting> +<setting name="veth"> +</setting> <setting name="vlan"> </setting> <setting name="vpn"> |