From b324b03e2b603dafddfaac607e5f98d9cd9c0f04 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 19 Sep 2013 22:04:12 +0800 Subject: discover: register network devices with the device handler We'd like to correlate incoming network boot options with a device, so register the interface with the device hander. Signed-off-by: Jeremy Kerr --- discover/pb-discover.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'discover/pb-discover.c') diff --git a/discover/pb-discover.c b/discover/pb-discover.c index 26df9b3..6def090 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -173,20 +173,21 @@ int main(int argc, char *argv[]) config_init(NULL); - network = network_init(server, waitset, opts.dry_run == opt_yes); - if (!network) - return EXIT_FAILURE; - handler = device_handler_init(server, waitset, opts.dry_run == opt_yes); if (!handler) return EXIT_FAILURE; discover_server_set_device_source(server, handler); + /* init our device sources: udev, network and user events */ udev = udev_init(waitset, handler); if (!udev) return EXIT_FAILURE; + network = network_init(handler, waitset, opts.dry_run == opt_yes); + if (!network) + return EXIT_FAILURE; + uev = user_event_init(waitset, handler); if (!uev) return EXIT_FAILURE; -- cgit v1.2.1