diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-11-16 18:08:48 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-11-16 18:08:48 -0600 |
| commit | cfaa80b261d3b77a2e0d502479bbd300763268a0 (patch) | |
| tree | 7c19c2219f0b19358672a702e1f24441621fc227 /callouts | |
| parent | 8f699a77f2e4d825aa73c9c794637cf504a3e9b2 (diff) | |
| parent | 568f5e073be31fdf357a4ab4a484d57e9559f29b (diff) | |
Merge remote branch 'origin/master' into rm-userset
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)) { |