| commit | f1c10dd02876dffd29a6312499cf92bb266fb144 | [log] [tgz] |
|---|---|---|
| author | Yi Li <adamliyi@msn.com> | Fri Oct 21 12:08:47 2016 +0800 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Tue Nov 01 19:26:32 2016 +0000 |
| tree | 35b7f1e12ab07ffffb72d0c5b40b767aa9176bdd | |
| parent | c453265da6cb16cd3b9dbbb0c93db464df158a4f [diff] |
Update obmc-console-server service name The obmc-console-server service name has been updated to include the device name. Also the 'Conflicts' directive does not look necessary. Related with openbmc/obmc-console#7 Change-Id: If2002de8bc8edd07c846253f7c5c47c9be276a3b Signed-off-by: Yi Li <adamliyi@msn.com>
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb b/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb index 8499400..76e3ba5 100644 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb +++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb
@@ -20,6 +20,7 @@ REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200" OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" SYSTEMD_SERVICE_${PN} = " \ ${PN}@.service \
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket index 5f297a7..7a7abb5 100644 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket +++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
@@ -1,7 +1,6 @@ [Unit] Description=Phosphor Host Console SSH Per-Connection socket -Conflicts=obmc-console-ssh.service -Requires=obmc-console.service +Requires=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service [Socket] ListenStream=2200