summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-phosphor/console
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2016-08-25 22:36:30 -0400
committerPatrick Williams <patrick@stwcx.xyz>2016-09-13 18:08:12 +0000
commitfd1a57c0c07916bcaa97804af5cc2b573fe3cd24 (patch)
treed5fa3308564318491521072ca8cd1620689344d1 /meta-phosphor/common/recipes-phosphor/console
parent997e7367d0917e91910386b83737e1cece7c058e (diff)
downloadtalos-openbmc-fd1a57c0c07916bcaa97804af5cc2b573fe3cd24.tar.gz
talos-openbmc-fd1a57c0c07916bcaa97804af5cc2b573fe3cd24.zip
Use systemd substitutions
Make use of the new substitution feature in the Phosphor systemd bitbake class. Change-Id: I2db85347809ef557a53e92af3ffcf17c8003b3ce Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/console')
-rw-r--r--meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service6
-rw-r--r--meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
index 74d5a7a32..c3fcc03dc 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
@@ -4,8 +4,8 @@ Wants=obmc-console.service
[Service]
Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear"
-EnvironmentFile=-/etc/default/dropbear
-ExecStart=-@SBINDIR@/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c @BINDIR@/obmc-console-client $DROPBEAR_EXTRA_ARGS
-ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+EnvironmentFile={envfiledir}/dropbear
+ExecStart=-{sbindir}/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c {bindir}/obmc-console-client $DROPBEAR_EXTRA_ARGS
+ExecReload={base_bindir}/kill -HUP $MAINPID
StandardInput=socket
KillMode=process
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
index 2f540ea79..032dc2e7f 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
@@ -2,8 +2,8 @@
Description=OpenBMC console daemon
[Service]
-ExecStart=/usr/sbin/obmc-console-server ttyS0
+ExecStart={sbindir}/obmc-console-server ttyS0
Restart=always
[Install]
-WantedBy=multi-user.target
+WantedBy={SYSTEMD_DEFAULT_TARGET}
OpenPOWER on IntegriCloud