diff options
| author | Michael Biebl <biebl@debian.org> | 2017-07-12 17:57:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-07-12 17:57:30 +0200 |
| commit | b9f0451fa35393ceedf6d9d20b78c43578ebea5d (patch) | |
| tree | 417afcdd717020ad44e25fadee4b89de23316e83 /src/nm-config.h | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
New upstream version 1.8.2 upstream/1.8.2
Diffstat (limited to 'src/nm-config.h')
| -rw-r--r-- | src/nm-config.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nm-config.h b/src/nm-config.h index 283d6a1b..c5ff7c67 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -63,6 +63,7 @@ #define NM_CONFIG_KEYFILE_KEY_MAIN_DHCP "dhcp" #define NM_CONFIG_KEYFILE_KEY_MAIN_DEBUG "debug" #define NM_CONFIG_KEYFILE_KEY_MAIN_HOSTNAME_MODE "hostname-mode" +#define NM_CONFIG_KEYFILE_KEY_MAIN_SLAVES_ORDER "slaves-order" #define NM_CONFIG_KEYFILE_KEY_LOGGING_BACKEND "backend" #define NM_CONFIG_KEYFILE_KEY_CONFIG_ENABLE "enable" #define NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS ".was" @@ -204,13 +205,18 @@ struct _NMConfigDeviceStateData { const char *connection_uuid; const char *perm_hw_addr_fake; + + /* whether the device was nm-owned (0/1) or -1 for + * non-software devices. */ + gint nm_owned; }; NMConfigDeviceStateData *nm_config_device_state_load (int ifindex); gboolean nm_config_device_state_write (int ifindex, NMConfigDeviceStateManagedType managed, const char *perm_hw_addr_fake, - const char *connection_uuid); + const char *connection_uuid, + gint nm_owned); void nm_config_device_state_prune_unseen (GHashTable *seen_ifindexes); /*****************************************************************************/ |