diff options
| author | Kyle Nieman <kyle.nieman@fii-na.com> | 2023-04-04 00:14:58 +0300 |
|---|---|---|
| committer | Vivekanand Veeracholan <vveerach@google.com> | 2023-07-01 01:29:24 +0300 |
| commit | 451f64a878299ebdda12481996bea6dd60ce0247 (patch) | |
| tree | 84c386998bfa2b5e588a79c0abc7732d0c0e240b /meta-fii | |
| parent | e35ee53d018610b54784168ee9c118fa0be5d459 (diff) | |
| download | openbmc-451f64a878299ebdda12481996bea6dd60ce0247.tar.xz | |
meta-fii: meta-mori: Update unit power behavior
1) Remove unwanted dependencies for the warm reboot targets.
2) Set the power policy to always on to prevent unwanted host power off.
3) Change user reset command to use ipmitool command
Change-Id: Ie87296a48349219860c79f6275133595f3501e43
Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
Diffstat (limited to 'meta-fii')
3 files changed, 12 insertions, 4 deletions
diff --git a/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh b/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh index 26730df614..963dc3b27e 100644 --- a/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh +++ b/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh @@ -66,9 +66,8 @@ function reset() { ;; system) # S0 system reset - set_gpio_ctrl S0_SYSRESET 0 - sleep 1 - set_gpio_ctrl S0_SYSRESET 1 + echo "System has been reset, host will start booting in a few minutes" + ipmitool chassis power reset ;; btn) # virtual power button on diff --git a/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml b/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml index 461fec8459..217ad346e6 100644 --- a/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml +++ b/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml @@ -21,3 +21,9 @@ Default: 32 BridgeDeviceAddress: Default: 32 + +/xyz/openbmc_project/control/host0/power_restore_policy: + - Interface: xyz.openbmc_project.Control.Power.RestorePolicy + Properties: + PowerRestorePolicy: + Default: RestorePolicy::Policy::AlwaysOn diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend index c1e731f546..1eb8793046 100644 --- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -18,9 +18,12 @@ pkg_postinst:${PN}-obmc-targets:append:mori() { rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target" rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service" rm "$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/obmc-chassis-poweroff@0.target" + rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/obmc-host-force-warm-reboot@0.target" + rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" + rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/obmc-host-stop@0.target" + rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/phosphor-reboot-host@0.service" } - pkg_prerm:${PN}-obmc-targets:prepend:mori() { LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" rm $LINK |