diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-07 23:17:15 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 23:05:23 +0300 |
| commit | 859b92ea28bb75d98c98b058339e181c208bba5b (patch) | |
| tree | ac7ca7810217ba491317674bf91201099723d96d /meta-phosphor/common/recipes-phosphor/chassis | |
| parent | f18df6b5af6fc0481a74059aec89edb3c4e2e6ec (diff) | |
| download | openbmc-859b92ea28bb75d98c98b058339e181c208bba5b.tar.xz | |
Remove use of mapper call
Replace invocations of mapper call with a call to busctl and mapper
get-service. This provides equivalent functionality but opens the
door for dropping a systemd patch we have carried for some time.
Change-Id: Iea0cce89341939b49b095d1f5010415578331d4d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/chassis')
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service index dc3174db3..c1de92f3b 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service @@ -12,8 +12,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] RemainAfterExit=yes Type=oneshot -ExecStart=/usr/bin/env mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1 -SyslogIdentifier=mapper +ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1" +SyslogIdentifier=op-power-start [Install] WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service index 1321c215e..40dbf3637 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service @@ -10,8 +10,8 @@ Conflicts=obmc-chassis-poweron@%i.target [Service] RemainAfterExit=yes -ExecStart=/usr/bin/env mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0 -SyslogIdentifier=mapper +ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0" +SyslogIdentifier=op-power-stop [Install] WantedBy=obmc-host-stop@%i.target |