diff options
author | Geoff Levand <geoff@infradead.org> | 2012-03-08 20:48:21 -0800 |
---|---|---|
committer | Geoff Levand <geoff@infradead.org> | 2012-03-08 20:51:37 -0800 |
commit | 604a1ccf072f9f33326fb6dc919c1b6233d40866 (patch) | |
tree | 88297738af995f9ea8df78e134d0a2dac111d157 /lib/system/system.c | |
parent | ae0ba68f475ae5b057aad6538765bc8702134b9a (diff) | |
download | talos-petitboot-604a1ccf072f9f33326fb6dc919c1b6233d40866.tar.gz talos-petitboot-604a1ccf072f9f33326fb6dc919c1b6233d40866.zip |
Add --start-daemon option to ui programs
Add the option --start-daemon to automatically start
pb-discover if it is not already started. For use
when running as a stand-alone app.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'lib/system/system.c')
-rw-r--r-- | lib/system/system.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/system/system.c b/lib/system/system.c index 7371445..1b506d2 100644 --- a/lib/system/system.c +++ b/lib/system/system.c @@ -17,6 +17,7 @@ #include "system.h" const struct pb_system_apps pb_system_apps = { + .prefix = PREFIX, .cp = "/bin/cp", .kexec = "/sbin/kexec", .mount = "/bin/mount", @@ -104,7 +105,7 @@ int pb_rmdir_recursive(const char *base, const char *dir) * @cmd_argv: An argument list array for execv. */ -int pb_run_cmd(const char *const *cmd_argv) +int pb_run_cmd(const char *const *cmd_argv, int wait) { #if defined(DEBUG) enum {do_debug = 1}; @@ -149,6 +150,9 @@ int pb_run_cmd(const char *const *cmd_argv) exit(EXIT_FAILURE); } + if (!wait && !waitpid(pid, &status, WNOHANG)) + return 0; + if (waitpid(pid, &status, 0) == -1) { pb_log("%s: waitpid failed: %s\n", __func__, strerror(errno)); |