colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: don't require a device for virtual connections

Browse Source 
They may not have had their devices created yet, and the activation
process creates the device, so allow NULL device paths for
activation.
This commit is contained in:
Dan Williams
2012-03-06 12:01:49 -06:00
parent 11da5fb6bc
commit 4fc8b8ccd0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cli/src/connections.c
View File

@@ -1854,6 +1854,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
gboolean id_specified = FALSE;
gboolean wait = TRUE;
GError *error = NULL;
gboolean is_virtual = FALSE;
/* Set default timeout for connection activation. It can take quite a long time.
* Using 90 seconds.
@@ -1957,9 +1958,13 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
g_assert (s_con);
con_type = nm_setting_connection_get_connection_type (s_con);
device_found = find_device_for_connection (nmc, connection, iface, ap, nsp, &device, &spec_object, &error);
if ( nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME)
|| nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME))
is_virtual = TRUE;
if (!device_found) {
device_found = find_device_for_connection (nmc, connection, iface, ap, nsp, &device, &spec_object, &error);
/* Virtual connection may not have their interfaces created yet */
if (!device_found && !is_virtual) {
if (error)
g_string_printf (nmc->return_text, _("Error: No suitable device found: %s."), error->message);
else