X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=system.c;h=4bbceee7bdf0cfb2a11d8e96817373cdb0864e98;hp=569a75d5b4df947c0166afe4b14855073a968188;hb=796ba3b9cf5aecd5ded7c64e772536cf849ffdc8;hpb=3c771f9e4ba46d3e39334cb20eab98221043f1e2

diff --git a/system.c b/system.c
index 569a75d..4bbceee 100644
--- a/system.c
+++ b/system.c
@@ -18,6 +18,7 @@
 #endif
 #include <sys/ioctl.h>
 #include <sys/types.h>
+#include <sys/reboot.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -27,14 +28,13 @@
 #include <libubox/uloop.h>
 
 #include "procd.h"
+#include "sysupgrade.h"
 #include "watchdog.h"
 
 static struct blob_buf b;
 static int notify;
 static struct ubus_context *_ctx;
 
-int upgrade_running = 0;
-
 static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
                  struct ubus_request_data *req, const char *method,
                  struct blob_attr *msg)
@@ -80,7 +80,7 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
 		fclose(f);
 	}
 
-	if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL ||
+	if ((f = fopen("/tmp/sysinfo/board_name", "r")) != NULL ||
 	    (f = fopen("/proc/device-tree/model", "r")) != NULL)
 	{
 		if (fgets(line, sizeof(line), f))
@@ -234,11 +234,11 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj,
 	return UBUS_STATUS_OK;
 }
 
-static int system_upgrade(struct ubus_context *ctx, struct ubus_object *obj,
-			struct ubus_request_data *req, const char *method,
-			struct blob_attr *msg)
+static int system_reboot(struct ubus_context *ctx, struct ubus_object *obj,
+			 struct ubus_request_data *req, const char *method,
+			 struct blob_attr *msg)
 {
-	upgrade_running = 1;
+	procd_shutdown(RB_AUTOBOOT);
 	return 0;
 }
 
@@ -335,45 +335,34 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 enum {
-	NAND_PATH,
-	__NAND_MAX
+	SYSUPGRADE_PATH,
+	SYSUPGRADE_PREFIX,
+	SYSUPGRADE_COMMAND,
+	__SYSUPGRADE_MAX
 };
 
-static const struct blobmsg_policy nand_policy[__NAND_MAX] = {
-	[NAND_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+static const struct blobmsg_policy sysupgrade_policy[__SYSUPGRADE_MAX] = {
+	[SYSUPGRADE_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+	[SYSUPGRADE_PREFIX] = { .name = "prefix", .type = BLOBMSG_TYPE_STRING },
+	[SYSUPGRADE_COMMAND] = { .name = "command", .type = BLOBMSG_TYPE_STRING },
 };
 
-static void
-procd_spawn_upgraded(char *path)
-{
-	char *wdt_fd = watchdog_fd();
-	char *argv[] = { "/tmp/upgraded", NULL, NULL};
-
-	argv[1] = path;
-
-	DEBUG(2, "Exec to upgraded now\n");
-	if (wdt_fd) {
-		watchdog_no_cloexec();
-		setenv("WDTFD", wdt_fd, 1);
-	}
-	execvp(argv[0], argv);
-}
-
-static int nand_set(struct ubus_context *ctx, struct ubus_object *obj,
-			struct ubus_request_data *req, const char *method,
-			struct blob_attr *msg)
+static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
+		      struct ubus_request_data *req, const char *method,
+		      struct blob_attr *msg)
 {
-	struct blob_attr *tb[__NAND_MAX];
+	struct blob_attr *tb[__SYSUPGRADE_MAX];
 
 	if (!msg)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	blobmsg_parse(nand_policy, __NAND_MAX, tb, blob_data(msg), blob_len(msg));
-	if (!tb[NAND_PATH])
+	blobmsg_parse(sysupgrade_policy, __SYSUPGRADE_MAX, tb, blob_data(msg), blob_len(msg));
+	if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	procd_spawn_upgraded(blobmsg_get_string(tb[NAND_PATH]));
-	fprintf(stderr, "Yikees, something went wrong. no /sbin/upgraded ?\n");
+	sysupgrade_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]),
+				 blobmsg_get_string(tb[SYSUPGRADE_PATH]),
+				 tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL);
 	return 0;
 }
 
@@ -387,12 +376,10 @@ procd_subscribe_cb(struct ubus_context *ctx, struct ubus_object *obj)
 static const struct ubus_method system_methods[] = {
 	UBUS_METHOD_NOARG("board", system_board),
 	UBUS_METHOD_NOARG("info",  system_info),
-	UBUS_METHOD_NOARG("upgrade", system_upgrade),
+	UBUS_METHOD_NOARG("reboot", system_reboot),
 	UBUS_METHOD("watchdog", watchdog_set, watchdog_policy),
 	UBUS_METHOD("signal", proc_signal, signal_policy),
-
-	/* must remain at the end as it ia not always loaded */
-	UBUS_METHOD("nandupgrade", nand_set, nand_policy),
+	UBUS_METHOD("sysupgrade", sysupgrade, sysupgrade_policy),
 };
 
 static struct ubus_object_type system_object_type =
@@ -421,12 +408,8 @@ procd_bcast_event(char *event, struct blob_attr *msg)
 
 void ubus_init_system(struct ubus_context *ctx)
 {
-	struct stat s;
 	int ret;
 
-	if (stat("/sbin/upgraded", &s))
-		system_object.n_methods -= 1;
-
 	_ctx = ctx;
 	ret = ubus_add_object(ctx, &system_object);
 	if (ret)