summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Eckert2024-06-20 07:53:12 +0000
committerHauke Mehrtens2024-10-20 21:33:14 +0000
commit0f88a52dc8a5451bd7f1f33ffff3b1ba3db98174 (patch)
tree14934e5e428f70eaa7282786039485b4ce8aa8c1
parentf230c11771875adc1f74bef013e8cea1fa1867bc (diff)
downloadprocd-0f88a52dc8a5451bd7f1f33ffff3b1ba3db98174.tar.gz
system: replace openwrt_release with os-release
The information required for output via the ubus is currently read from the file '/etc/openwrt_release'. The same information can also be found under '/usr/lib/os-release'. This file contains further information and is also the most common used file in other Linux distributions. So let´s use this file. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
-rw-r--r--system.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/system.c b/system.c
index 21ec3cd..dcc37e0 100644
--- a/system.c
+++ b/system.c
@@ -251,7 +251,7 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
if (rootfs_type)
blobmsg_add_string(&b, "rootfs_type", rootfs_type);
- if ((f = fopen("/etc/openwrt_release", "r")) != NULL)
+ if ((f = fopen("/usr/lib/os-release", "r")) != NULL)
{
c = blobmsg_open_table(&b, "release");
@@ -267,17 +267,17 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
*(val++) = 0;
- if (!strcasecmp(key, "DISTRIB_ID"))
+ if (!strcasecmp(key, "NAME"))
key = "distribution";
- else if (!strcasecmp(key, "DISTRIB_RELEASE"))
+ else if (!strcasecmp(key, "VERSION"))
key = "version";
- else if (!strcasecmp(key, "DISTRIB_REVISION"))
+ else if (!strcasecmp(key, "BUILD_ID"))
key = "revision";
- else if (!strcasecmp(key, "DISTRIB_CODENAME"))
+ else if (!strcasecmp(key, "VERSION_CODENAME"))
key = "codename";
- else if (!strcasecmp(key, "DISTRIB_TARGET"))
+ else if (!strcasecmp(key, "OPENWRT_BOARD"))
key = "target";
- else if (!strcasecmp(key, "DISTRIB_DESCRIPTION"))
+ else if (!strcasecmp(key, "PRETTY_NAME"))
key = "description";
else
continue;