X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=system.c;h=151f613002369de61194434c692339aae8618aa9;hp=6e85ad798808283c11166772bd9fcc5b59238333;hb=53e92d43d6d1b196eae8a6657335ad8b89b8142e;hpb=453116e08e6a9349374bbff427b75f57ce5387c9

diff --git a/system.c b/system.c
index 6e85ad7..151f613 100644
--- a/system.c
+++ b/system.c
@@ -279,6 +279,7 @@ static int system_reboot(struct ubus_context *ctx, struct ubus_object *obj,
 enum {
 	WDT_FREQUENCY,
 	WDT_TIMEOUT,
+	WDT_MAGICCLOSE,
 	WDT_STOP,
 	__WDT_MAX
 };
@@ -286,6 +287,7 @@ enum {
 static const struct blobmsg_policy watchdog_policy[__WDT_MAX] = {
 	[WDT_FREQUENCY] = { .name = "frequency", .type = BLOBMSG_TYPE_INT32 },
 	[WDT_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
+	[WDT_MAGICCLOSE] = { .name = "magicclose", .type = BLOBMSG_TYPE_BOOL },
 	[WDT_STOP] = { .name = "stop", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -320,6 +322,9 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
 		 watchdog_timeout(timeout);
 	}
 
+	if (tb[WDT_MAGICCLOSE])
+		watchdog_set_magicclose(blobmsg_get_bool(tb[WDT_MAGICCLOSE]));
+
 	if (tb[WDT_STOP])
 		watchdog_set_stopped(blobmsg_get_bool(tb[WDT_STOP]));
 
@@ -334,6 +339,7 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
 	blobmsg_add_string(&b, "status", status);
 	blobmsg_add_u32(&b, "timeout", watchdog_timeout(0));
 	blobmsg_add_u32(&b, "frequency", watchdog_frequency(0));
+	blobmsg_add_u8(&b, "magicclose", watchdog_get_magicclose());
 	ubus_send_reply(ctx, req, b.head);
 
 	return 0;
@@ -397,7 +403,9 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
 	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;
+
+	/* sysupgrade_exec_upgraded() will never return unless something has gone wrong */
+	return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
 static void