obmc-console: Introduce console-id, deprecate socket-id
The name `socket-id` exposes too much detail about the implementation.
Really the tag identifies the console, so name it as such.
Maintain backwards compatibility until we've converted all the in-tree
OpenBMC users over to `console-id`. Once that's done we can drop support
for `socket-id`.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I5aa2ba84835d64901e459b42bfe7be59043466c7
diff --git a/console-server.c b/console-server.c
index fd97a6f..3440fb2 100644
--- a/console-server.c
+++ b/console-server.c
@@ -395,9 +395,15 @@
{
ssize_t len;
- console->console_id = config_get_value(config, "socket-id");
+ console->console_id = config_get_value(config, "console-id");
+
+ /* socket-id is deprecated */
if (!console->console_id) {
- warnx("Error: The socket-id is not set in the config file");
+ console->console_id = config_get_value(config, "socket-id");
+ }
+
+ if (!console->console_id) {
+ warnx("Error: The console-id is not set in the config file");
return EXIT_FAILURE;
}