Add checking ApplyTime for static layout
Add a check for static BMC whether auto reboot to apply update or not.
Tested: Verified with setting ApplyTime to Immediate and using
obmc-phosphor-image-<platorm>-<timestamp>.static.mtd.all.tar,
and BMC code update works fine.
Change-Id: I13b77b783746b083e09d96757ad7868fe7660fe3
Signed-off-by: Bright Cheng <bright_cheng@wiwynn.com>
diff --git a/ubi/Makefile.am.include b/ubi/Makefile.am.include
index 51ebf57..173251c 100644
--- a/ubi/Makefile.am.include
+++ b/ubi/Makefile.am.include
@@ -11,8 +11,5 @@
%reldir%/obmc-flash-bmc-ubiro-remove@.service \
%reldir%/obmc-flash-bmc-ubirw.service \
%reldir%/obmc-flash-bmc-ubirw-remove.service \
- %reldir%/obmc-flash-bmc-updateubootvars@.service \
- %reldir%/reboot-guard-disable.service \
- %reldir%/reboot-guard-enable.service \
- %reldir%/force-reboot.service
+ %reldir%/obmc-flash-bmc-updateubootvars@.service
endif
diff --git a/ubi/force-reboot.service b/ubi/force-reboot.service
deleted file mode 100644
index 73ff274..0000000
--- a/ubi/force-reboot.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Force reboot of the BMC
-Requires=reboot-guard-disable.service
-After=reboot-guard-disable.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/sbin/reboot
diff --git a/ubi/reboot-guard-disable.service b/ubi/reboot-guard-disable.service
deleted file mode 100644
index 70d702f..0000000
--- a/ubi/reboot-guard-disable.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Removes the guard that blocks BMC reboot
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/obmc-flash-bmc rebootguarddisable
diff --git a/ubi/reboot-guard-enable.service b/ubi/reboot-guard-enable.service
deleted file mode 100644
index 7bd2873..0000000
--- a/ubi/reboot-guard-enable.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Enable a guard that blocks BMC reboot
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/obmc-flash-bmc rebootguardenable