diff options
19 files changed, 39 insertions, 39 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service index adb47d18f..aaaaa0e34 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC chassis management daemon [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-chassisd +ExecStart={sbindir}/obmc-phosphor-chassisd [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} 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} diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service index b397e2f16..1f1e832d6 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service @@ -5,10 +5,10 @@ Before=obmc-mapper.target [Service] Restart=always Type=dbus -ExecStart=/usr/sbin/phosphor-mapper -BusName=org.openbmc.ObjectMapper +ExecStart={sbindir}/phosphor-mapper +BusName={BUSNAME} TimeoutStartSec=300 Environment="PYTHONUNBUFFERED=1" [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/events/files/obmc-phosphor-event.service b/meta-phosphor/common/recipes-phosphor/events/files/obmc-phosphor-event.service index a93fce054..5aadcc03a 100644 --- a/meta-phosphor/common/recipes-phosphor/events/files/obmc-phosphor-event.service +++ b/meta-phosphor/common/recipes-phosphor/events/files/obmc-phosphor-event.service @@ -4,7 +4,7 @@ Description=Phosphor OpenBMC event management daemon [Service] EnvironmentFile=-/etc/default/eventd/eventd.conf Restart=always -ExecStart=/usr/sbin/obmc-phosphor-eventd $OPTIONS +ExecStart={sbindir}/obmc-phosphor-eventd $OPTIONS [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service b/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service index 27d9bfe12..531c49dc6 100644 --- a/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service +++ b/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service @@ -3,8 +3,8 @@ Description=Phosphor OpenBMC QEMU application example [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-example-pydbus +ExecStart={sbindir}/obmc-phosphor-example-pydbus Environment="PYTHONUNBUFFERED=1" [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service index 442e910fb..7bdfc56d1 100644 --- a/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service +++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC QEMU application example [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-example-sdbus +ExecStart={sbindir}/obmc-phosphor-example-sdbus [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service index 6698e120d..900895437 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service +++ b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC fan management daemon [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-fand +ExecStart={sbindir}/obmc-phosphor-fand [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service index 1b1b892cb..ee1640a15 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service +++ b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC flash management daemon [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-flashd +ExecStart={sbindir}/obmc-phosphor-flashd [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service index ffc311078..e032e8fc3 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC BT to DBUS [Service] Restart=always -ExecStart=/usr/sbin/btbridged +ExecStart={sbindir}/btbridged [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service index f882880c2..dc3adaeaa 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service @@ -5,7 +5,7 @@ After=clear-once.service [Service] Restart=always -ExecStart=/usr/sbin/ipmid +ExecStart={sbindir}/ipmid [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service b/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service index 4aba68fb6..4ed7ee40f 100644 --- a/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service +++ b/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service @@ -2,8 +2,8 @@ Description=Phosphor Inverse ARP daemon [Service] -ExecStart=/usr/sbin/inarp +ExecStart={sbindir}/inarp Restart=always [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service b/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service index 490b9ce1b..43e013167 100644 --- a/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service +++ b/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service @@ -4,8 +4,8 @@ Requires=network.service After=network.service [Service] -ExecStart=/usr/sbin/netman_watch_dns /run/systemd/netif/state +ExecStart={sbindir}/netman_watch_dns /run/systemd/netif/state Restart=always [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/network/network/network.service b/meta-phosphor/common/recipes-phosphor/network/network/network.service index cb4fc3f62..905020e9a 100644 --- a/meta-phosphor/common/recipes-phosphor/network/network/network.service +++ b/meta-phosphor/common/recipes-phosphor/network/network/network.service @@ -2,9 +2,9 @@ Description=Network DBUS object [Service] -ExecStart=/usr/sbin/netman.py +ExecStart={sbindir}/netman.py Environment="PYTHONUNBUFFERED=1" Restart=always [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service index d3bddab9a..d22d2a2da 100644 --- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service @@ -3,5 +3,5 @@ Description=DBUS introspecting REST server. [Service] Restart=always -ExecStart=/usr/sbin/rest-dbus +ExecStart={sbindir}/rest-dbus Environment="PYTHONUNBUFFERED=1" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service index 247164feb..bf203f8b8 100644 --- a/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service +++ b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC sensor management daemon [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-sensord +ExecStart={sbindir}/obmc-phosphor-sensord [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service b/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service index e53005e85..0fd0a241c 100755 --- a/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service +++ b/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service @@ -2,9 +2,9 @@ Description=Settings DBUS Object [Service] -ExecStart=/usr/sbin/settings_manager.py +ExecStart={sbindir}/settings_manager.py Environment="PYTHONUNBUFFERED=1" Restart=always [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service index 3a68b68d8..71e0b0ca3 100644 --- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service +++ b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service @@ -3,7 +3,7 @@ Description=Phosphor OpenBMC system management daemon [Service] Restart=always -ExecStart=/usr/sbin/obmc-phosphor-sysd +ExecStart={sbindir}/obmc-phosphor-sysd [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/users/files/obmc-phosphor-user.service b/meta-phosphor/common/recipes-phosphor/users/files/obmc-phosphor-user.service index 7c1ffce13..e11a0a93f 100644 --- a/meta-phosphor/common/recipes-phosphor/users/files/obmc-phosphor-user.service +++ b/meta-phosphor/common/recipes-phosphor/users/files/obmc-phosphor-user.service @@ -2,9 +2,9 @@ Description=Phosphor OpenBMC user management daemon [Service] -ExecStart=/usr/sbin/obmc-phosphor-userd +ExecStart={sbindir}/obmc-phosphor-userd Environment="PYTHONUNBUFFERED=1" Restart=always [Install] -WantedBy=multi-user.target +WantedBy={SYSTEMD_DEFAULT_TARGET} |
