#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)
fclose(f);
}
+ if ((f = fopen("/tmp/sysinfo/board_name", "r")) != NULL)
+ {
+ if (fgets(line, sizeof(line), f))
+ {
+ val = strtok(line, "\t\n");
+
+ if (val)
+ blobmsg_add_string(&b, "board_name", val);
+ }
+
+ fclose(f);
+ }
+ else if ((f = fopen("/proc/device-tree/compatible", "r")) != NULL)
+ {
+ if (fgets(line, sizeof(line), f))
+ {
+ val = strtok(line, "\t\n");
+
+ if (val)
+ {
+ next = val;
+ while ((next = strchr(next, ',')) != NULL)
+ {
+ *next = '-';
+ next++;
+ }
+
+ blobmsg_add_string(&b, "board_name", val);
+ }
+ }
+
+ fclose(f);
+ }
+
if ((f = fopen("/etc/openwrt_release", "r")) != NULL)
{
c = blobmsg_open_table(&b, "release");
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)
-{
- upgrade_running = 1;
- return 0;
-}
-
static int system_reboot(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
enum {
WDT_FREQUENCY,
WDT_TIMEOUT,
+ WDT_MAGICCLOSE,
WDT_STOP,
__WDT_MAX
};
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 },
};
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]));
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;
enum {
SYSUPGRADE_PATH,
SYSUPGRADE_PREFIX,
+ SYSUPGRADE_COMMAND,
__SYSUPGRADE_MAX
};
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_exec_upgraded(const char *prefix, char *path)
-{
- char *wdt_fd = watchdog_fd();
- char *argv[] = { "/sbin/upgraded", NULL, NULL};
-
- if (chroot(prefix)) {
- fprintf(stderr, "Failed to chroot for upgraded exec.\n");
- return;
- }
-
- argv[1] = path;
-
- DEBUG(2, "Exec to upgraded now\n");
- if (wdt_fd) {
- watchdog_set_cloexec(false);
- setenv("WDTFD", wdt_fd, 1);
- }
- execvp(argv[0], argv);
-
- /* Cleanup on failure */
- fprintf(stderr, "Failed to exec upgraded.\n");
- unsetenv("WDTFD");
- watchdog_set_cloexec(true);
- chroot(".");
-}
-
static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX])
return UBUS_STATUS_INVALID_ARGUMENT;
- procd_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]),
- blobmsg_get_string(tb[SYSUPGRADE_PATH]));
- return 0;
+ 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);
+
+ /* sysupgrade_exec_upgraded() will never return unless something has gone wrong */
+ return UBUS_STATUS_UNKNOWN_ERROR;
}
static void
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),
- UBUS_METHOD("nandupgrade", sysupgrade, sysupgrade_policy),
UBUS_METHOD("sysupgrade", sysupgrade, sysupgrade_policy),
};