commit 7a612d4fa70fe6bfd39964c0191a82e6e4546188
author Andrew Jeffery <andrew@aj.id.au> Mon Jun 05 16:16:57 2023 +0930
committer Andrew Jeffery <andrew@aj.id.au> Tue Jun 06 02:54:36 2023 +0000
tree 7e1f321d00309272f0b718fb58df510d3bb5bb3c
parent ced2bfd0ecf96fecfb4a1c946ce8465dd4c7524e

obmc-console: Convert configs from socket-id to console-id

As of 9a8f30ec5b58 ("obmc-console: Introduce console-id, deprecate
socket-id") in obmc-console `console-id` is preferred over `socket-id`.
Convert all in-tree configurations to `console-id` to enable removal of
support for the deprecated `socket-id` configuration option.

Change-Id: Ifd50603c378cfed5eb793b829b8296b7964e4194
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
index 88aa57c..9af5732 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
@@ -1 +1 @@
-socket-id = host0
+console-id = host0

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
index 22273d4..23e856f 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
@@ -1 +1 @@
-socket-id = host1
+console-id = host1

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
index 0eeb5b7..4a1d19f 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
@@ -1 +1 @@
-socket-id = host2
+console-id = host2

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
index be8e82e..9976752 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
@@ -1 +1 @@
-socket-id = host3
+console-id = host3

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
index 6379c6e..90b842a 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
@@ -1,4 +1,4 @@
 local-tty = ttyS0
 baud = 57600
-socket-id = host0
+console-id = host0
 logfile = /var/log/obmc-console0.log

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
index c678990..b8837fc 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
@@ -1,4 +1,4 @@
 local-tty = ttyS1
 baud = 57600
-socket-id = host1
+console-id = host1
 logfile = /var/log/obmc-console1.log

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
index 91e7bd5..37f1ada 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
@@ -1,4 +1,4 @@
 local-tty = ttyS2
 baud = 57600
-socket-id = host2
+console-id = host2
 logfile = /var/log/obmc-console2.log

meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf

diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
index 991eaca..86de160 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
@@ -1,4 +1,4 @@
 local-tty = ttyS3
 baud = 57600
-socket-id = host3
+console-id = host3
 logfile = /var/log/obmc-console3.log