X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fui-system.c;h=a828e2ee3b92a3b881ea5d3b5e04bf38f8523d29;hp=4b0f144e41eb2d64cce7812e421236e4cb761042;hb=6b842bb2559116a949c6a569ac39f5c56ebc1be1;hpb=59e81c46a962da51e51474e9b36258ff0e04ae42

diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c
index 4b0f144..a828e2e 100644
--- a/ui/common/ui-system.c
+++ b/ui/common/ui-system.c
@@ -46,7 +46,7 @@ int pb_start_daemon(void)
 	argv[0] = name;
 	argv[1] =  NULL;
 
-	result = pb_run_cmd(argv, 0);
+	result = pb_run_cmd(argv, 0, 0);
 
 	talloc_free(name);
 
@@ -91,7 +91,7 @@ static int kexec_load(const char *l_image, const char *l_initrd,
 	*p++ = l_image;			/* 5 */
 	*p++ = NULL;			/* 6 */
 
-	result = dry_run ? 0 : pb_run_cmd(argv, 1);
+	result = pb_run_cmd(argv, 1, dry_run);
 
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
@@ -122,7 +122,7 @@ static int kexec_reboot(int dry_run)
 	*p++ =  "now";			/* 3 */
 	*p++ =  NULL;			/* 4 */
 
-	result = dry_run ? 0 : pb_run_cmd(argv, 1);
+	result = pb_run_cmd(argv, 1, dry_run);
 
 	/* On error, force a kexec with the -e option */
 
@@ -132,7 +132,7 @@ static int kexec_reboot(int dry_run)
 		*p++ = "-e";			/* 2 */
 		*p++ = NULL;			/* 3 */
 
-		result = pb_run_cmd(argv, 1);
+		result = pb_run_cmd(argv, 1, 0);
 	}
 
 	if (result)
@@ -145,7 +145,7 @@ static int kexec_reboot(int dry_run)
  * pb_run_kexec - Run kexec with the supplied boot options.
  */
 
-int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
+int pb_run_kexec(const struct pb_boot_data *bd, int dry_run)
 {
 	int result;
 	char *l_image = NULL;
@@ -153,21 +153,20 @@ int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
 	unsigned int clean_image = 0;
 	unsigned int clean_initrd = 0;
 
-	pb_log("%s: image:   '%s'\n", __func__, kd->image);
-	pb_log("%s: initrd:  '%s'\n", __func__, kd->initrd);
-	pb_log("%s: args:    '%s'\n", __func__, kd->args);
-	pb_log("%s: dry_run: '%d'\n", __func__, dry_run);
+	pb_log("%s: image:   '%s'\n", __func__, bd->image);
+	pb_log("%s: initrd:  '%s'\n", __func__, bd->initrd);
+	pb_log("%s: args:    '%s'\n", __func__, bd->args);
 
 	result = -1;
 
-	if (kd->image) {
-		l_image = pb_load_file(NULL, kd->image, &clean_image);
+	if (bd->image) {
+		l_image = pb_load_file(NULL, bd->image, &clean_image);
 		if (!l_image)
 			goto no_load;
 	}
 
-	if (kd->initrd) {
-		l_initrd = pb_load_file(NULL, kd->initrd, &clean_initrd);
+	if (bd->initrd) {
+		l_initrd = pb_load_file(NULL, bd->initrd, &clean_initrd);
 		if (!l_initrd)
 			goto no_load;
 	}
@@ -175,7 +174,7 @@ int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
 	if (!l_image && !l_initrd)
 		goto no_load;
 
-	result = kexec_load(l_image, l_initrd, kd->args, dry_run);
+	result = kexec_load(l_image, l_initrd, bd->args, dry_run);
 
 no_load:
 	if (clean_image)