#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/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))
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 {
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_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 sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
return UBUS_STATUS_INVALID_ARGUMENT;
blobmsg_parse(sysupgrade_policy, __SYSUPGRADE_MAX, tb, blob_data(msg), blob_len(msg));
- if (!tb[SYSUPGRADE_PATH])
+ if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX])
return UBUS_STATUS_INVALID_ARGUMENT;
- procd_spawn_upgraded(blobmsg_get_string(tb[SYSUPGRADE_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;
}
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),
};