summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2017-03-23 17:41:28 +1100
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2017-07-11 14:32:17 +1000
commit417265c68731537deeed22a3a3530cd6dd986513 (patch)
tree670d46ca2802a90b966fbb84b5932e5134497157
parentf03763aec302d379fe9f7494af136a215e57ab16 (diff)
downloadtalos-petitboot-417265c68731537deeed22a3a3530cd6dd986513.zip
talos-petitboot-417265c68731537deeed22a3a3530cd6dd986513.tar.gz
discover/sysinfo: Add system_info_reinit()
Currently over reinit events the system info is not affected. However network and block device information can change over reinit, so clear this information. Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/device-handler.c2
-rw-r--r--discover/sysinfo.c18
-rw-r--r--discover/sysinfo.h1
3 files changed, 21 insertions, 0 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index ec1eee3..a0c21b7 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1407,6 +1407,8 @@ static void device_handler_reinit_sources(struct device_handler *handler)
return;
}
+ system_info_reinit();
+
udev_reinit(handler->udev);
network_shutdown(handler->network);
diff --git a/discover/sysinfo.c b/discover/sysinfo.c
index 0ac29c1..e8e6d52 100644
--- a/discover/sysinfo.c
+++ b/discover/sysinfo.c
@@ -139,3 +139,21 @@ void system_info_init(struct discover_server *s)
sysinfo = talloc_zero(server, struct system_info);
platform_get_sysinfo(sysinfo);
}
+
+/* Only reset device information. Platform information is static */
+void system_info_reinit(void)
+{
+ unsigned int i;
+
+ for (i = 0; i < sysinfo->n_blockdevs; i++)
+ talloc_free(sysinfo->blockdevs[i]);
+ talloc_free(sysinfo->blockdevs);
+ sysinfo->blockdevs = NULL;
+ sysinfo->n_blockdevs = 0;
+
+ for (i = 0; i < sysinfo->n_interfaces; i++)
+ talloc_free(sysinfo->interfaces[i]);
+ talloc_free(sysinfo->interfaces);
+ sysinfo->interfaces = NULL;
+ sysinfo->n_interfaces = 0;
+}
diff --git a/discover/sysinfo.h b/discover/sysinfo.h
index 19ed950..c570951 100644
--- a/discover/sysinfo.h
+++ b/discover/sysinfo.h
@@ -15,6 +15,7 @@ void system_info_register_blockdev(const char *name, const char *uuid,
const char *mountpoint);
void system_info_init(struct discover_server *server);
+void system_info_reinit(void);
#endif /* SYSINFO_H */
OpenPOWER on IntegriCloud