upgraded: add support for passing a "command" argument to stage2

[project/procd.git] / system.c

diff --git a/system.c b/system.c
index 193c9b0..69ba57e 100644 (file)
--- a/system.c
+++ b/system.c
@@ -346,19 +346,21 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 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)
+procd_exec_upgraded(const char *prefix, char *path, char *command)
 {
        char *wdt_fd = watchdog_fd();
-       char *argv[] = { "/sbin/upgraded", NULL, NULL};
+       char *argv[] = { "/sbin/upgraded", NULL, NULL, NULL};
 
        if (chroot(prefix)) {
                fprintf(stderr, "Failed to chroot for upgraded exec.\n");
@@ -366,6 +368,7 @@ procd_exec_upgraded(const char *prefix, char *path)
        }
 
        argv[1] = path;
+       argv[2] = command;
 
        DEBUG(2, "Exec to upgraded now\n");
        if (wdt_fd) {
@@ -395,7 +398,8 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        procd_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]),
-                           blobmsg_get_string(tb[SYSUPGRADE_PATH]));
+                           blobmsg_get_string(tb[SYSUPGRADE_PATH]),
+                           tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL);
        return 0;
 }