From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 18 Jun 2017 22:53:00 +0000 (+0200)
Subject: system: introduce new attribute board_name
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=453116e08e6a9349374bbff427b75f57ce5387c9;p=project%2Fprocd.git

system: introduce new attribute board_name

Instead of modifying the already defined 'model' attribute rather
introduce a new attribute board_name to return either
/tmp/sysinfo/board_name or /proc/device-tree/compatible.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/system.c b/system.c
index 4bbceee..6e85ad7 100644
--- 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");