diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2010-11-01 16:02:32 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2010-11-01 16:02:32 +0100 |
| commit | 4501e33b852be184a30cbdc2e49803d341db9d0c (patch) | |
| tree | d638c06d8125164880b086316c157650fe658016 /callouts | |
| parent | bc76e40dec6b017c9886fd0c4bc19c6da62e43ec (diff) | |
| download | NetworkManager-4501e33b852be184a30cbdc2e49803d341db9d0c.tar.gz | |
dispatcher: don't warn about invalid connection for 'hostname' action (rh #627649)
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/nm-dispatcher-action.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher-action.c index 828d8be13c..8040853f7a 100644 --- a/callouts/nm-dispatcher-action.c +++ b/callouts/nm-dispatcher-action.c @@ -489,6 +489,10 @@ nm_dispatcher_action (Handler *h, if (!d->persist) d->quit_timeout = g_timeout_add_seconds (10, quit_timeout_cb, NULL); + /* Hostname changes don't require a device nor contain a connection */ + if (!strcmp (action, "hostname")) + goto dispatch; + connection = nm_connection_new_from_hash (connection_hash, error); if (connection) { NMSettingConnection *s_con; @@ -506,10 +510,6 @@ nm_dispatcher_action (Handler *h, *error = NULL; } - /* Hostname changes don't require a device */ - if (!strcmp (action, "hostname")) - goto dispatch; - /* interface name */ value = g_hash_table_lookup (device_props, NMD_DEVICE_PROPS_INTERFACE); if (!value || !G_VALUE_HOLDS_STRING (value)) { |