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

diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c
index bd6dd31..a828e2e 100644
--- a/ui/common/ui-system.c
+++ b/ui/common/ui-system.c
@@ -33,14 +33,38 @@
 #include "ui-system.h"
 
 /**
- * run_kexec_local - Final kexec helper.
+ * pb_start_daemon - start the pb-discover daemon.
+ */
+
+int pb_start_daemon(void)
+{
+	int result;
+	const char *argv[2];
+	char *name = talloc_asprintf(NULL, "%s/sbin/pb-discover",
+		pb_system_apps.prefix);
+
+	argv[0] = name;
+	argv[1] =  NULL;
+
+	result = pb_run_cmd(argv, 0, 0);
+
+	talloc_free(name);
+
+	if (result)
+		pb_log("%s: failed: (%d)\n", __func__, result);
+
+	return result;
+}
+
+/**
+ * kexec_load - kexec load 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.
  */
 
-static int run_kexec_local(const char *l_image, const char *l_initrd,
-	const char *args)
+static int kexec_load(const char *l_image, const char *l_initrd,
+	const char *args, int dry_run)
 {
 	int result;
 	const char *argv[6];
@@ -49,44 +73,71 @@ static int run_kexec_local(const char *l_image, const char *l_initrd,
 	char *s_args = NULL;
 
 	p = argv;
-	*p++ = pb_system_apps.kexec;		/* 1 */
+	*p++ = pb_system_apps.kexec;	/* 1 */
+	*p++ = "-l";			/* 2 */
 
 	if (l_initrd) {
 		s_initrd = talloc_asprintf(NULL, "--initrd=%s", l_initrd);
 		assert(s_initrd);
-		*p++ = s_initrd;		 /* 2 */
+		*p++ = s_initrd;	 /* 3 */
 	}
 
 	if (args) {
 		s_args = talloc_asprintf(NULL, "--append=%s", args);
 		assert(s_args);
-		*p++ = s_args;			 /* 3 */
+		*p++ = s_args;		/* 4 */
 	}
 
-	/* First try by telling kexec to run shutdown */
+	*p++ = l_image;			/* 5 */
+	*p++ = NULL;			/* 6 */
+
+	result = pb_run_cmd(argv, 1, dry_run);
+
+	if (result)
+		pb_log("%s: failed: (%d)\n", __func__, result);
+
+	talloc_free(s_initrd);
+	talloc_free(s_args);
+
+	return result;
+}
+
+/**
+ * kexec_reboot - Helper to boot the new kernel.
+ *
+ * Must only be called after a successful call to kexec_load().
+ */
+
+static int kexec_reboot(int dry_run)
+{
+	int result = 0;
+	const char *argv[4];
+	const char **p;
 
-	*(p + 0) = l_image;
-	*(p + 1) = NULL;
+	/* First try running shutdown.  Init scripts should run 'exec -e' */
 
-	result = pb_run_cmd(argv);
+	p = argv;
+	*p++ = pb_system_apps.shutdown;	/* 1 */
+	*p++ =  "-r";			/* 2 */
+	*p++ =  "now";			/* 3 */
+	*p++ =  NULL;			/* 4 */
 
-	/* kexec will return zero on success */
-	/* On error, force a kexec with the -f option */
+	result = pb_run_cmd(argv, 1, dry_run);
+
+	/* On error, force a kexec with the -e option */
 
 	if (result) {
-		*(p + 0) = "-f";		/* 4 */
-		*(p + 1) = l_image;		/* 5 */
-		*(p + 2) = NULL;		/* 6 */
+		p = argv;
+		*p++ = pb_system_apps.kexec;	/* 1 */
+		*p++ = "-e";			/* 2 */
+		*p++ = NULL;			/* 3 */
 
-		result = pb_run_cmd(argv);
+		result = pb_run_cmd(argv, 1, 0);
 	}
 
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
 
-	talloc_free(s_initrd);
-	talloc_free(s_args);
-
 	return result;
 }
 
@@ -94,36 +145,49 @@ static int run_kexec_local(const char *l_image, const char *l_initrd,
  * pb_run_kexec - Run kexec with the supplied boot options.
  */
 
-int pb_run_kexec(const struct pb_kexec_data *kd)
+int pb_run_kexec(const struct pb_boot_data *bd, int dry_run)
 {
 	int result;
 	char *l_image = NULL;
 	char *l_initrd = NULL;
+	unsigned int clean_image = 0;
+	unsigned int clean_initrd = 0;
+
+	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);
 
-	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);
+	result = -1;
 
-	if (kd->image) {
-		l_image = pb_load_file(NULL, kd->image);
+	if (bd->image) {
+		l_image = pb_load_file(NULL, bd->image, &clean_image);
 		if (!l_image)
-			return -1;
+			goto no_load;
 	}
 
-	if (kd->initrd) {
-		l_initrd = pb_load_file(NULL, kd->initrd);
+	if (bd->initrd) {
+		l_initrd = pb_load_file(NULL, bd->initrd, &clean_initrd);
 		if (!l_initrd)
-			return -1;
+			goto no_load;
 	}
 
 	if (!l_image && !l_initrd)
-		return -1;
+		goto no_load;
 
-	result = run_kexec_local(l_image, l_initrd, kd->args);
+	result = kexec_load(l_image, l_initrd, bd->args, dry_run);
+
+no_load:
+	if (clean_image)
+		unlink(l_image);
+	if (clean_initrd)
+		unlink(l_initrd);
 
 	talloc_free(l_image);
 	talloc_free(l_initrd);
 
+	if (!result)
+		result = kexec_reboot(dry_run);
+
 	return result;
 }