ensure hostboot volatile not cleared on warm reboots
A while back, the obmc-vpnor-enable-clearvolatile@.service was added to
the obmc-chassis-poweron@.target. This was done to ensure the volatile
data was cleared on any chassis power on to handle situations where the
user is using debug tools like istep or cronus to boot the system after
the chassis power was turned on. Prior to that, the clear was done only
when obmc-host-start@.target was started.
Adding this service to the obmc-chassis-poweron@target had an unintended
consequence though. The chassis power on target is called during a warm
reboot. The assumption was that all services were already running so it
was a "warm" reboot because none of those service were re-run. The
obmc-vpnor-enable-clearvolatile@.service however is a onetime service
that did not remain after exit. This means this service was run during
this warm reboot which breaks the design point of not clearing the host
volatile data on a warm reboot.
This commit now makes this service continue after it has run and only
stops it when a chassis power off is issued. This ensures the host
volatile data is only ever cleared after a system has its chassis
powered off.
Tested:
- Verified that a warm reboot now results in the service not running
- Verified that a normal host reboot (chassis power cycle) still results
in the service running as expected
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ifad75b4d0f7a4e1162d4a45a1c346e622a458240
diff --git a/vpnor/obmc-vpnor-enable-clearvolatile@.service b/vpnor/obmc-vpnor-enable-clearvolatile@.service
index bad59b1..5fc3794 100644
--- a/vpnor/obmc-vpnor-enable-clearvolatile@.service
+++ b/vpnor/obmc-vpnor-enable-clearvolatile@.service
@@ -4,11 +4,12 @@
Wants=mapper-wait@-org-open_power-control-volatile.service
After=mapper-wait@-org-open_power-control-volatile.service
Before=obmc-vpnor-check-clearvolatile@%i.service
+Conflicts=obmc-chassis-poweroff@%i.target
ConditionPathExists=!/run/openbmc/host@%i-on
[Service]
Type=oneshot
-RemainAfterExit=no
+RemainAfterExit=yes
ExecStart=/bin/sh -c "busctl set-property `mapper get-service /org/open_power/control/volatile` /org/open_power/control/volatile xyz.openbmc_project.Object.Enable Enabled b true"
SyslogIdentifier=obmc-vpnor-enable-clearvolatile