summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--discover/platform-powerpc.c20
-rw-r--r--discover/platform.c7
-rw-r--r--discover/platform.h2
-rw-r--r--discover/sysinfo.c37
-rwxr-xr-xutils/pb-sysinfo6
5 files changed, 31 insertions, 41 deletions
diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 24cc521..2ce69e7 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -9,6 +9,7 @@
#include <sys/fcntl.h>
#include <sys/stat.h>
+#include <file/file.h>
#include <talloc/talloc.h>
#include <list/list.h>
#include <log/log.h>
@@ -738,6 +739,23 @@ static int save_config(struct platform *p, struct config *config)
return rc;
}
+static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
+{
+ struct platform_powerpc *platform = p->platform_data;
+ int len, rc;
+ char *buf;
+
+ rc = read_file(platform, "/proc/device_tree/model", &buf, &len);
+ if (rc == 0)
+ sysinfo->type = talloc_steal(sysinfo, buf);
+
+ rc = read_file(platform, "/proc/device_tree/system-id", &buf, &len);
+ if (rc == 0)
+ sysinfo->identifier = talloc_steal(sysinfo, buf);
+
+ return 0;
+}
+
static bool probe(struct platform *p, void *ctx)
{
struct platform_powerpc *platform;
@@ -759,12 +777,14 @@ static bool probe(struct platform *p, void *ctx)
return true;
}
+
static struct platform platform_powerpc = {
.name = "powerpc",
.dhcp_arch_id = 0x000e,
.probe = probe,
.load_config = load_config,
.save_config = save_config,
+ .get_sysinfo = get_sysinfo,
};
register_platform(platform_powerpc);
diff --git a/discover/platform.c b/discover/platform.c
index 0dced16..65e9ed4 100644
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -143,6 +143,13 @@ const struct platform *platform_get(void)
return platform;
}
+int platform_get_sysinfo(struct system_info *info)
+{
+ if (platform && platform->get_sysinfo)
+ return platform->get_sysinfo(platform, info);
+ return -1;
+}
+
int config_set(struct config *newconfig)
{
int rc;
diff --git a/discover/platform.h b/discover/platform.h
index a01ac71..0a1aa5e 100644
--- a/discover/platform.h
+++ b/discover/platform.h
@@ -8,6 +8,7 @@ struct platform {
bool (*probe)(struct platform *, void *);
int (*load_config)(struct platform *, struct config *);
int (*save_config)(struct platform *, struct config *);
+ int (*get_sysinfo)(struct platform *, struct system_info *);
uint16_t dhcp_arch_id;
void *platform_data;
};
@@ -15,6 +16,7 @@ struct platform {
int platform_init(void *ctx);
int platform_fini(void);
const struct platform *platform_get(void);
+int platform_get_sysinfo(struct system_info *info);
/* configuration interface */
const struct config *config_get(void);
diff --git a/discover/sysinfo.c b/discover/sysinfo.c
index be45438..219369a 100644
--- a/discover/sysinfo.c
+++ b/discover/sysinfo.c
@@ -5,13 +5,12 @@
#include <process/process.h>
#include "discover-server.h"
+#include "platform.h"
#include "sysinfo.h"
static struct system_info *sysinfo;
static struct discover_server *server;
-static const char *sysinfo_helper = PKG_LIBEXEC_DIR "/pb-sysinfo";
-
const struct system_info *system_info_get(void)
{
return sysinfo;
@@ -102,41 +101,9 @@ void system_info_register_blockdev(const char *name, const char *uuid,
discover_server_notify_system_info(server, sysinfo);
}
-static void system_info_set_identifier(struct system_info *info)
-{
- struct process *process;
- int rc;
- const char *argv[] = {
- sysinfo_helper, NULL, NULL,
- };
-
- process = process_create(info);
- process->path = sysinfo_helper;
- process->argv = argv;
- process->keep_stdout = true;
-
- argv[1] = "--type";
- rc = process_run_sync(process);
-
- if (!rc) {
- info->type = talloc_strndup(info, process->stdout_buf,
- process->stdout_len);
- }
-
- argv[1] = "--id";
- rc = process_run_sync(process);
-
- if (!rc) {
- info->identifier = talloc_strndup(info, process->stdout_buf,
- process->stdout_len);
- }
-
- process_release(process);
-}
-
void system_info_init(struct discover_server *s)
{
server = s;
sysinfo = talloc_zero(server, struct system_info);
- system_info_set_identifier(sysinfo);
+ platform_get_sysinfo(sysinfo);
}
diff --git a/utils/pb-sysinfo b/utils/pb-sysinfo
index 001535a..7d6635c 100755
--- a/utils/pb-sysinfo
+++ b/utils/pb-sysinfo
@@ -1,12 +1,6 @@
#!/bin/sh
case "$1" in
-'--type')
- tr -d '\0' < /proc/device-tree/model
- ;;
-'--id')
- tr -d '\0' < /proc/device-tree/system-id
- ;;
'--debug-enabled')
exec >/dev/null 2>&1
nvram --print-config=petitboot,debug? | grep -q true && exit 0
OpenPOWER on IntegriCloud