X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=6def0900bc73cddf56397c67641825899e8abde1;hp=26df9b3ff3f6062f9bdc85c85ae1dde068cc8e92;hb=2ea5eb23b027519372dd20fbe8f958c06ac2aa6c;hpb=f611bde3f182e9a4befb48a0160d1831708aca67 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;