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

diff --git a/lib/system/system.c b/lib/system/system.c
index 65bd6bf..df27c87 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -17,20 +17,37 @@
 #include "system.h"
 
 const struct pb_system_apps pb_system_apps = {
-	.cp = "/bin/cp",
-	.kexec = "/sbin/kexec",
-	.mount = "/bin/mount",
-	.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,
+	.umount		= HOST_PROG_UMOUNT,
+	.wget		= HOST_PROG_WGET,
+	.ip		= HOST_PROG_IP,
+	.udhcpc		= HOST_PROG_UDHCPC,
+	.udhcpc6	= HOST_PROG_UDHCPC6,
+	.vgscan		= HOST_PROG_VGSCAN,
+	.vgchange	= HOST_PROG_VGCHANGE,
+	.pb_plugin	= HOST_PROG_PB_PLUGIN,
+	.pb_exec	= HOST_PROG_PB_EXEC,
+	.sh		= HOST_PROG_SH,
+	.scsi_rescan	= HOST_PROG_SCSI_RESCAN,
 };
 
+#ifndef TFTP_TYPE
+#define TFTP_TYPE TFTP_TYPE_UNKNOWN
+#endif
+
+enum tftp_type tftp_type = TFTP_TYPE;
+
 int pb_mkdir_recursive(const char *dir)
 {
 	struct stat statbuf;
+	int rc, mode = 0755;
 	char *str, *sep;
-	int mode = 0755;
 
 	if (!*dir)
 		return 0;
@@ -47,6 +64,8 @@ int pb_mkdir_recursive(const char *dir)
 	str = talloc_strdup(NULL, dir);
 	sep = strchr(*str == '/' ? str + 1 : str, '/');
 
+	rc = 0;
+
 	while (1) {
 
 		/* terminate the path at sep */
@@ -55,7 +74,8 @@ int pb_mkdir_recursive(const char *dir)
 
 		if (mkdir(str, mode) && errno != EEXIST) {
 			pb_log("mkdir(%s): %s\n", str, strerror(errno));
-			return -1;
+			rc = -1;
+			break;
 		}
 
 		if (!sep)
@@ -68,7 +88,7 @@ int pb_mkdir_recursive(const char *dir)
 
 	talloc_free(str);
 
-	return 0;
+	return rc;
 }
 
 int pb_rmdir_recursive(const char *base, const char *dir)
@@ -81,12 +101,12 @@ int pb_rmdir_recursive(const char *base, const char *dir)
 
 	cur = talloc_strdup(NULL, dir);
 
-	while (strcmp(base, dir)) {
+	while (strcmp(base, cur)) {
 
-		rmdir(dir);
+		rmdir(cur);
 
 		/* null-terminate at the last slash */
-		pos = strrchr(dir, '/');
+		pos = strrchr(cur, '/');
 		if (!pos)
 			break;
 
@@ -97,73 +117,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.
- */
-
-int pb_run_cmd(const char *const *cmd_argv)
-{
-#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: ", __func__);
-		while (*p) {
-			pb_log("%s ", *p);
-			p++;
-		}
-		pb_log("\n");
-	} else
-		pb_log("%s: %s\n", __func__, cmd_argv[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 (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);
-}