diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-03-10 11:28:21 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-06-30 18:53:40 +0200 |
| commit | 187041f4153a5640d45a3715839c4585419d4155 (patch) | |
| tree | a83e53baf11081efb73fc7fd538ad87a022736e8 | |
| parent | c451833ab4dd466fc9dd29c70d7e24eb0e10d157 (diff) | |
| download | NetworkManager-187041f4153a5640d45a3715839c4585419d4155.tar.gz | |
WIP: keyfile: don't write out deprecated virt_iface_name propertyth/rh979425_set_virtual_iface_name
| -rw-r--r-- | src/settings/plugins/keyfile/writer.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index 5f3ebe25f4..7d124394ff 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -37,6 +37,10 @@ #include <nm-setting-ip4-config.h> #include <nm-setting-bluetooth.h> #include <nm-setting-8021x.h> +#include <nm-setting-bond.h> +#include <nm-setting-bridge.h> +#include <nm-setting-team.h> +#include <nm-setting-vlan.h> #include <nm-utils.h> #include <string.h> #include <arpa/inet.h> @@ -753,6 +757,16 @@ cert_writer (GKeyFile *file, g_assert_not_reached (); } +static void +null_writer (GKeyFile *file, + const char *keyfile_dir, + const char *uuid, + NMSetting *setting, + const char *key, + const GValue *value) +{ +} + typedef struct { const char *setting_name; const char *key; @@ -846,6 +860,18 @@ static KeyWriter key_writers[] = { { NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, cert_writer }, + { NM_SETTING_BOND_SETTING_NAME, + NM_SETTING_BOND_INTERFACE_NAME, + null_writer }, + { NM_SETTING_BRIDGE_SETTING_NAME, + NM_SETTING_BRIDGE_INTERFACE_NAME, + null_writer }, + { NM_SETTING_TEAM_SETTING_NAME, + NM_SETTING_TEAM_INTERFACE_NAME, + null_writer }, + { NM_SETTING_VLAN_SETTING_NAME, + NM_SETTING_VLAN_INTERFACE_NAME, + null_writer }, { NULL, NULL, NULL } }; |