diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-09-05 18:09:10 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-09-05 18:09:24 -0400 |
| commit | 1d3e456924a8b79a85b0fb8d1621624bd3e68c55 (patch) | |
| tree | fef499b12b5e2c74fc20edf1aef079d24c0cb370 /isys/iface.h | |
| parent | e2b9a1c7f6ae5d4366410a18f521434df415fc97 (diff) | |
| download | anaconda-1d3e456924a8b79a85b0fb8d1621624bd3e68c55.tar.gz anaconda-1d3e456924a8b79a85b0fb8d1621624bd3e68c55.tar.xz anaconda-1d3e456924a8b79a85b0fb8d1621624bd3e68c55.zip | |
Make NM work for the DHCP case, at least (dcbw) (#461071).
This patch does two things: (1) It makes sure that NM doesn't run more than
once, though we still need to figure out why it's being asked to start up
several times. (2) Block the rest of the network configuration process from
running until after NM is up and we can talk to it. This fixes the traceback
where nothing is providing the .services file.
We still need to investigate whether static network configuration works and
how the UI flows in error cases.
Diffstat (limited to 'isys/iface.h')
| -rw-r--r-- | isys/iface.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/isys/iface.h b/isys/iface.h index 8dcb1900a..8785db2b3 100644 --- a/isys/iface.h +++ b/isys/iface.h @@ -27,6 +27,8 @@ #include <netlink/cache.h> #include <netlink/socket.h> +#include <dbus/dbus.h> + /* Enumerated types used in iface.c as well as loader's network code */ enum { IPUNUSED, IPV4, IPV6 }; @@ -154,7 +156,7 @@ int iface_have_in6_addr(struct in6_addr *addr6); /* * Start NetworkManager */ -int iface_start_NetworkManager(void); +int iface_start_NetworkManager(DBusConnection *connection, char **error); /* * Set Maximum Transfer Unit (MTU) on specified interface |