X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fsystem%2Fsystem.c;h=d77159d5a7b882470648c740aa301b0314fd67c6;hb=e7815dc27286b66bd67e4727a1a4f51a5b862b0d;hp=65bd6bf57bc5391cd6bc91aec5f8b48a9f553987;hpb=322a024f44bd6c2d665010588d74a681c9703431;p=petitboot

diff --git a/lib/system/system.c b/lib/system/system.c
index 65bd6bf..d77159d 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -17,9 +17,11 @@
 #include "system.h"
 
 const struct pb_system_apps pb_system_apps = {
+	.prefix = PREFIX,
 	.cp = "/bin/cp",
 	.kexec = "/sbin/kexec",
 	.mount = "/bin/mount",
+	.shutdown = "/sbin/shutdown",
 	.sftp = "/usr/bin/sftp",
 	.tftp = "/usr/bin/tftp",
 	.umount = "/bin/umount",
@@ -101,9 +103,11 @@ int pb_rmdir_recursive(const char *base, const char *dir)
 /**
  * pb_run_cmd - Run the supplied command.
  * @cmd_argv: An argument list array for execv.
+ * @wait: Wait for the child process to complete before returning.
+ * @dry_run: Don't actually fork and exec.
  */
 
-int pb_run_cmd(const char *const *cmd_argv)
+int pb_run_cmd(const char *const *cmd_argv, int wait, int dry_run)
 {
 #if defined(DEBUG)
 	enum {do_debug = 1};
@@ -116,14 +120,19 @@ int pb_run_cmd(const char *const *cmd_argv)
 	if (do_debug) {
 		const char *const *p = cmd_argv;
 
-		pb_log("%s: ", __func__);
+		pb_log("%s: %s", __func__, (dry_run ? "(dry-run) " : ""));
+
 		while (*p) {
 			pb_log("%s ", *p);
 			p++;
 		}
 		pb_log("\n");
 	} else
-		pb_log("%s: %s\n", __func__, cmd_argv[0]);
+		pb_log("%s: %s%s\n", __func__, (dry_run ? "(dry-run) " : ""),
+			cmd_argv[0]);
+
+	if (dry_run)
+		return 0;
 
 	pid = fork();
 
@@ -148,6 +157,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));