X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=6def0900bc73cddf56397c67641825899e8abde1;hp=c16d6903ed5c1da180dfd615beed1950c824b20b;hb=8ad9aba4b4463c9231eb441c81694686443b011a;hpb=307b4b091e0bc298964e90888bf179431e32c134

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index c16d690..6def090 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -158,8 +158,6 @@ int main(int argc, char *argv[])
 
 	signal(SIGINT, sigint_handler);
 
-	config_init(NULL);
-
 	if (opts.no_autoboot == opt_yes)
 		config_set_autoboot(false);
 
@@ -173,9 +171,7 @@ int main(int argc, char *argv[])
 	if (!procset)
 		return EXIT_FAILURE;
 
-	network = network_init(server, waitset, opts.dry_run == opt_yes);
-	if (!network)
-		return EXIT_FAILURE;
+	config_init(NULL);
 
 	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
 	if (!handler)
@@ -183,10 +179,15 @@ int main(int argc, char *argv[])
 
 	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;