X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fsystem%2Fsystem.c;h=b895610d291500f07e222f7a8397cbf2770f5b04;hp=c9fe979465239d589d5db35de8c57ed75643949e;hb=9f191cc3c194ed51534c22e2dae15b2c08c8abc2;hpb=ca5a62c1d04a3eea1d1c307d4fa4f0b1559140d2

diff --git a/lib/system/system.c b/lib/system/system.c
index c9fe979..b895610 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -28,6 +28,8 @@ const struct pb_system_apps pb_system_apps = {
 	.wget		= HOST_PROG_WGET,
 	.ip		= HOST_PROG_IP,
 	.udhcpc		= HOST_PROG_UDHCPC,
+	.vgscan		= HOST_PROG_VGSCAN,
+	.vgchange	= HOST_PROG_VGCHANGE,
 };
 
 #ifndef TFTP_TYPE
@@ -39,8 +41,8 @@ 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;
@@ -57,6 +59,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 */
@@ -65,7 +69,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)
@@ -78,7 +83,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)
@@ -91,12 +96,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;