X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fui-system.c;h=ad3bfba8a9d4534507f849925fd3e2b42bc26afd;hp=3f54191bfd5671c4e92476353a30401a8741bab3;hb=293fca73b2fe077e7780c1a42216a3db41a6e737;hpb=4414db4f4442009008ef15658bd4df2349c62ec7

diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c
index 3f54191..ad3bfba 100644
--- a/ui/common/ui-system.c
+++ b/ui/common/ui-system.c
@@ -29,53 +29,25 @@
 #include "log/log.h"
 #include <system/system.h>
 #include "talloc/talloc.h"
-#include "loader.h"
 #include "ui-system.h"
 
 /**
- * run_kexec_local - Final kexec helper.
- * @l_image: The local image file for kexec to execute.
- * @l_initrd: Optional local initrd file for kexec --initrd, can be NULL.
- * @args: Optional command line args for kexec --append, can be NULL.
+ * pb_start_daemon - start the pb-discover daemon.
  */
 
-static int run_kexec_local(const char *l_image, const char *l_initrd,
-	const char *args)
+int pb_start_daemon(void)
 {
 	int result;
-	const char *argv[8];
-	const char **p;
+	const char *argv[2];
+	char *name = talloc_asprintf(NULL, "%s/sbin/pb-discover",
+		pb_system_apps.prefix);
 
-	p = argv;
-	*p++ = pb_system_apps.kexec;		/* 1 */
+	argv[0] = name;
+	argv[1] =  NULL;
 
-	if (l_initrd) {
-		*p++ = "--initrd";		/* 2 */
-		*p++ = l_initrd;		/* 3 */
-	}
-
-	if (args) {
-		*p++ = "--append";		/* 4 */
-		*p++ = args;			/* 5 */
-	}
-
-	/* First try by telling kexec to run shutdown */
-
-	*(p + 0) = l_image;
-	*(p + 1) = NULL;
-
-	result = pb_run_cmd(argv);
+	result = pb_run_cmd(argv, 0, 0);
 
-	/* kexec will return zero on success */
-	/* On error, force a kexec with the -f option */
-
-	if (result) {
-		*(p + 0) = "-f";		/* 6 */
-		*(p + 1) = l_image;		/* 7 */
-		*(p + 2) = NULL;		/* 8 */
-
-		result = pb_run_cmd(argv);
-	}
+	talloc_free(name);
 
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
@@ -83,43 +55,6 @@ static int run_kexec_local(const char *l_image, const char *l_initrd,
 	return result;
 }
 
-/**
- * pb_run_kexec - Run kexec with the supplied boot options.
- *
- * For the convenience of the user, tries to load both files before
- * returning error.
- */
-
-int pb_run_kexec(const struct pb_kexec_data *kd)
-{
-	int result;
-	char *l_image;
-	char *l_initrd;
-
-	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);
-
-	if (kd->image)
-		l_image = pb_load_file(NULL, kd->image);
-	else {
-		l_image = NULL;
-		pb_log("%s: error null image\n", __func__);
-	}
-
-	l_initrd = kd->initrd ? pb_load_file(NULL, kd->initrd) : NULL;
-
-	if (!l_image || (kd->initrd && !l_initrd))
-		result = -1;
-	else
-		result = run_kexec_local(l_image, l_initrd, kd->args);
-
-	talloc_free(l_image);
-	talloc_free(l_initrd);
-
-	return result;
-}
-
 /**
  * pb_elf_hash - Standard elf hash routine.
  */