2008-08-26 Dan Williams <dcbw@redhat.com>
Add connection UUIDs, since connection names can be changed, and since old-style connection IDs could change over the life of the connection. The UUID should be assigned at connection creation time, be stable for a given connection, and should be unique among all connections for a given settings service. * configure.in libnm-util/Makefile.am - Require libuuid * introspection/nm-exported-connection.xml - Remove "GetID" method * libnm-glib/nm-dbus-connection.c libnm-glib/nm-settings.c libnm-glib/nm-settings.h - Remove id-related stuff * libnm-util/nm-utils.c libnm-util/nm-utils.h libnm-util/libnm-util.ver - (nm_utils_uuid_generate, nm_utils_uuid_generate_from_string): Add utility functions to generate UUIDs * libnm-util/nm-setting-connection.c libnm-util/nm-setting-connection.h - Add 'uuid' member to the connection setting - (verify): require valid 'uuid' for a valid connection * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-suse/nm-suse-connection.c system-settings/plugins/ifcfg-suse/parser.c system-settings/plugins/keyfile/nm-keyfile-connection.c system-settings/src/main.c - Remove id-related stuff - Give connections UUIDs where needed git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4013 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -64,7 +64,7 @@ get_int (const char *str, int *value)
|
||||
|
||||
static NMSetting *
|
||||
make_connection_setting (shvarFile *file,
|
||||
const char *iface,
|
||||
const char *iface,
|
||||
const char *type,
|
||||
const char *suggested)
|
||||
{
|
||||
@@ -85,6 +85,8 @@ make_connection_setting (shvarFile *file,
|
||||
|
||||
s_con->type = g_strdup (type);
|
||||
|
||||
s_con->uuid = nm_utils_uuid_generate_from_string (file->fileName);
|
||||
|
||||
str = svGetValue (file, "STARTMODE");
|
||||
if (str && !g_ascii_strcasecmp (str, "manual"))
|
||||
s_con->autoconnect = FALSE;
|
||||
|
Reference in New Issue
Block a user