service: fix SERVICE_ATTR_NAME usage in service_handle_set
[project/procd.git] / system.c
index 4bbceee..151f613 100644 (file)
--- a/system.c
+++ b/system.c
@@ -80,7 +80,7 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
                fclose(f);
        }
 
-       if ((f = fopen("/tmp/sysinfo/board_name", "r")) != NULL ||
+       if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL ||
            (f = fopen("/proc/device-tree/model", "r")) != NULL)
        {
                if (fgets(line, sizeof(line), f))
@@ -114,6 +114,40 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
                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");
@@ -245,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
 };
@@ -252,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 },
 };
 
@@ -286,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]));
 
@@ -300,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;
@@ -363,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