X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fsystem%2Fsystem.c;h=1b506d2edaf6b5e84f9ea4211e0cac1b189f3d31;hp=7371445a876d0bdbd8e7ad2d7da49a5aa266e743;hb=604a1ccf072f9f33326fb6dc919c1b6233d40866;hpb=c763f15030565eef2e8b28fdf471ef3e7dd9b933

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));