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

diff --git a/lib/system/system.c b/lib/system/system.c
index 7371445..cbf6b9f 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -17,14 +17,16 @@
 #include "system.h"
 
 const struct pb_system_apps pb_system_apps = {
-	.cp = "/bin/cp",
-	.kexec = "/sbin/kexec",
-	.mount = "/bin/mount",
-	.shutdown = "/sbin/shutdown",
-	.sftp = "/usr/bin/sftp",
-	.tftp = "/usr/bin/tftp",
-	.umount = "/bin/umount",
-	.wget = "/usr/bin/wget",
+	.prefix		= PREFIX,
+	.cp		= HOST_PROG_CP,
+	.kexec		= HOST_PROG_KEXEC,
+	.mount		= HOST_PROG_MOUNT,
+	.shutdown	= HOST_PROG_SHUTDOWN,
+	.sftp		= HOST_PROG_SFTP,
+	.tftp		= HOST_PROG_TFTP,
+	.udevadm	= HOST_PROG_UDEVADM,
+	.umount		= HOST_PROG_UMOUNT,
+	.wget		= HOST_PROG_WGET,
 };
 
 int pb_mkdir_recursive(const char *dir)
@@ -102,9 +104,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};
@@ -117,14 +121,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();
 
@@ -149,6 +158,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));