From 76c47ec7fe877f8a1841d878910f613e8f908cf6 Mon Sep 17 00:00:00 2001 From: George Hung Date: Thu, 19 Aug 2021 02:27:09 +0000 Subject: Revert "meta-quanta: gbs: update the related states D-bus service name" This reverts commit 97466ae307a67c30d592c9d97a1e9d6e458e0e5b. Reason for revert: x86-power-control supports DBUS service name numbering for single and multi hosts now. ref: https://gerrit.openbmc-project.xyz/45004 Change-Id: Id1fb9e61a10a457158c52990fe6c196d6fc44708 Signed-off-by: George Hung --- .../meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh | 4 ++-- meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh | 4 ++-- .../acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh | 2 +- .../phosphor-watchdog/phosphor-host-watchdog-powercycle.service | 4 ++-- .../phosphor-watchdog/phosphor-host-watchdog-poweroff.service | 2 +- .../watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta-quanta') diff --git a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh index 4723c20b4..a80082a1c 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh @@ -1,6 +1,6 @@ #!/bin/bash -BOOT_SERVICE_NAME="xyz.openbmc_project.State.Host0" +BOOT_SERVICE_NAME="xyz.openbmc_project.State.Host" BOOT_STATUS_OBJPATH="/xyz/openbmc_project/state/os" BOOT_INTERFACE_NAME="xyz.openbmc_project.State.OperatingSystem.Status" BOOT_Property="OperatingSystemState" @@ -11,7 +11,7 @@ LED_STANDBY_OBJPATH="/xyz/openbmc_project/led/groups/boot_status_standby" LED_INTERFACE_NAME="xyz.openbmc_project.Led.Group" LED_Property="Asserted" -PWR_STATE_SERVICE="xyz.openbmc_project.State.Chassis0" +PWR_STATE_SERVICE="xyz.openbmc_project.State.Chassis" PWR_STATE_OBJPATH="/xyz/openbmc_project/state/chassis0" PWR_STATE_INTERFACE_NAME="xyz.openbmc_project.State.Chassis" PWR_STATE_Property="CurrentPowerState" diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh index 17074ddaf..8b660c2dc 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh @@ -221,7 +221,7 @@ parse_pe_fru() { } check_power_status() { - res0="$(busctl get-property -j xyz.openbmc_project.State.Chassis0 \ + res0="$(busctl get-property -j xyz.openbmc_project.State.Chassis \ /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis \ CurrentPowerState | jq -r '.["data"]')" echo $res0 @@ -260,7 +260,7 @@ main() { set_gpio_persistence echo "Starting host power!" >&2 - busctl set-property xyz.openbmc_project.State.Host0 \ + busctl set-property xyz.openbmc_project.State.Host \ /xyz/openbmc_project/state/host0 \ xyz.openbmc_project.State.Host \ RequestedHostTransition s \ diff --git a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh index f6f1be4e0..6580fbe91 100644 --- a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh +++ b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh @@ -16,7 +16,7 @@ main() { local pgd_val - pgd_val="$(busctl get-property -j xyz.openbmc_project.State.Chassis0 \ + pgd_val="$(busctl get-property -j xyz.openbmc_project.State.Chassis \ /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis \ CurrentPowerState | jq -r '.["data"]')" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service index 6c3592f88..9b8b0d691 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service @@ -4,6 +4,6 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.PowerCycle -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause0 /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.PowerCycle +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service index 603856cb9..af7e6ef0d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service @@ -4,5 +4,5 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service index b444c6b1b..655618b05 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service @@ -4,6 +4,6 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.ForceWarmReboot -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause0 /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=busctl set-property xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.ForceWarmReboot +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer SyslogIdentifier=phosphor-watchdog -- cgit v1.2.3