]> git.ozlabs.org Git - petitboot/blobdiff - discover/pb-discover.c
lib/process: replace pb_run_cmd_pipe
[petitboot] / discover / pb-discover.c
index 70f0365af65fa76281311a52eb603adcb4555801..61da5097035ff6aedf12f6ba2c3b6692a790c170 100644 (file)
@@ -12,6 +12,7 @@
 #include <waiter/waiter.h>
 #include <log/log.h>
 #include <pb-config/pb-config.h>
+#include <process/process.h>
 
 #include "udev.h"
 #include "user-event.h"
@@ -118,6 +119,7 @@ int main(int argc, char *argv[])
        struct discover_server *server;
        struct network *network;
        struct waitset *waitset;
+       struct procset *procset;
        struct opts opts;
        struct pb_udev *udev;
        struct user_event *uev;
@@ -166,6 +168,10 @@ int main(int argc, char *argv[])
        if (!server)
                return EXIT_FAILURE;
 
+       procset = process_init(server, waitset);
+       if (!procset)
+               return EXIT_FAILURE;
+
        network = network_init(server, waitset, opts.dry_run == opt_yes);
        if (!network)
                return EXIT_FAILURE;
@@ -184,8 +190,6 @@ int main(int argc, char *argv[])
        if (!uev)
                return EXIT_FAILURE;
 
-       user_event_trigger(uev);
-
        for (running = 1; running;) {
                if (waiter_poll(waitset))
                        break;