meta-facebook: obmc-console: match console-id to OBMC_HOST_INSTANCES
Ensure that we are using host numbering as specified in
OBMC_HOST_INSTANCES so that there is consistency across
other interfaces (Power control/Etc) where single-host
uses host0 and multi-host systems use host1-hostN.
This change also renames /var/log/obmc-console0.log to
/var/log/obmc-console-host0.log to make it more explicit.
Change-Id: I5e189a7d49075d91b8292ed2fdfddf7decaf641e
Signed-off-by: Amithash Prasasd <amithash@meta.com>
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 90b842a..ae82d74 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
-console-id = host0
-logfile = /var/log/obmc-console0.log
+console-id = host1
+logfile = /var/log/obmc-console-host1.log
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 b8837fc..e42e398 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
-console-id = host1
-logfile = /var/log/obmc-console1.log
+console-id = host2
+logfile = /var/log/obmc-console-host2.log
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 37f1ada..166eaf5 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
-console-id = host2
-logfile = /var/log/obmc-console2.log
+console-id = host3
+logfile = /var/log/obmc-console-host3.log
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 86de160..6611698 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
-console-id = host3
-logfile = /var/log/obmc-console3.log
+console-id = host4
+logfile = /var/log/obmc-console-host4.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf
index f614234..885ffe9 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf
@@ -1,4 +1,4 @@
local-tty = ttyS5
baud = 57600
-console-id = host4
-logfile = /var/log/obmc-console4.log
+console-id = host5
+logfile = /var/log/obmc-console-host5.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf
index d8215fa..14feb75 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf
@@ -1,4 +1,4 @@
local-tty = ttyS6
baud = 57600
-console-id = host5
-logfile = /var/log/obmc-console5.log
+console-id = host6
+logfile = /var/log/obmc-console-host6.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf
index d36ffa8..492bfe6 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf
@@ -1,4 +1,4 @@
local-tty = ttyS7
baud = 57600
-console-id = host6
-logfile = /var/log/obmc-console6.log
+console-id = host7
+logfile = /var/log/obmc-console-host7.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf
index 4972435..c10d2c2 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf
@@ -1,4 +1,4 @@
local-tty = ttyS8
baud = 57600
-console-id = host7
-logfile = /var/log/obmc-console7.log
+console-id = host8
+logfile = /var/log/obmc-console8.log
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf
index 94f1dff..90891d4 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf
@@ -1,2 +1,4 @@
local-tty = ttyS2
baud = 57600
+console-id = host0
+logfile = /var/log/obmc-console-host0.log