← Back to branch summary

~network-manager/network-manager/ubuntu.hardy.07

« back to all changes in this revision

Viewing changes to src/dhcp-manager/nm-dhcp-dhcpcd.c

* merge 0.7~~svn20080905t025540+eni0 snapshot to hardy branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dhcp-manager/nm-dhcp-dhcpcd.c
83
83
                unsigned long int tmp = strtoul (pid_contents, NULL, 10);
84
84
 
85
85
                if (!((tmp == ULONG_MAX) && (errno == ERANGE)))
86
 
                        nm_dhcp_client_stop (device->iface, (pid_t) tmp, TRUE);
 
86
                        nm_dhcp_client_stop (device->iface, (pid_t) tmp);
87
87
                remove (device->pid_file);
88
88
        }
89
89
 
102
102
        g_ptr_array_add (argv, (gpointer) device->iface);
103
103
        g_ptr_array_add (argv, NULL);
104
104
 
105
 
        if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, 0,
 
105
        if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
106
106
                            &dhcpcd_child_setup, NULL, &pid, &error)) {
107
107
                nm_warning ("dhcpcd failed to start.  error: '%s'", error->message);
108
108
                g_error_free (error);