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

diff --git a/lib/system/system.c b/lib/system/system.c
index cbf6b9f..6e80b24 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -24,9 +24,10 @@ const struct pb_system_apps pb_system_apps = {
 	.shutdown	= HOST_PROG_SHUTDOWN,
 	.sftp		= HOST_PROG_SFTP,
 	.tftp		= HOST_PROG_TFTP,
-	.udevadm	= HOST_PROG_UDEVADM,
 	.umount		= HOST_PROG_UMOUNT,
 	.wget		= HOST_PROG_WGET,
+	.ip		= HOST_PROG_IP,
+	.udhcpc		= HOST_PROG_UDHCPC,
 };
 
 int pb_mkdir_recursive(const char *dir)
@@ -100,83 +101,3 @@ int pb_rmdir_recursive(const char *base, const char *dir)
 
 	return 0;
 }
-
-/**
- * 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 wait, int dry_run)
-{
-#if defined(DEBUG)
-	enum {do_debug = 1};
-#else
-	enum {do_debug = 0};
-#endif
-	int status;
-	pid_t pid;
-
-	if (do_debug) {
-		const char *const *p = cmd_argv;
-
-		pb_log("%s: %s", __func__, (dry_run ? "(dry-run) " : ""));
-
-		while (*p) {
-			pb_log("%s ", *p);
-			p++;
-		}
-		pb_log("\n");
-	} else
-		pb_log("%s: %s%s\n", __func__, (dry_run ? "(dry-run) " : ""),
-			cmd_argv[0]);
-
-	if (dry_run)
-		return 0;
-
-	pid = fork();
-
-	if (pid == -1) {
-		pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
-		return -1;
-	}
-
-	if (pid == 0) {
-		int log = fileno(pb_log_get_stream());
-
-		/* Redirect child output to log. */
-
-		status = dup2(log, STDOUT_FILENO);
-		assert(status != -1);
-
-		status = dup2(log, STDERR_FILENO);
-		assert(status != -1);
-
-		execvp(cmd_argv[0], (char *const *)cmd_argv);
-		pb_log("%s: exec failed: %s\n", __func__, strerror(errno));
-		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));
-		return -1;
-	}
-
-	if (do_debug && WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
-		pb_log("%s: signaled\n", __func__);
-
-	if (!WIFEXITED(status)) {
-		pb_log("%s: %s failed\n", __func__, cmd_argv[0]);
-		return -1;
-	}
-
-	if (WEXITSTATUS(status))
-		pb_log("%s: WEXITSTATUS %d\n", __func__, WEXITSTATUS(status));
-
-	return WEXITSTATUS(status);
-}