factory_install: Check main/EC write protection consistency only after clearing TPM
For devices that needs clearing TPM and using factory install shim for that,
they may only disabled BIOS write protection and keep EC protected.
BUG=chrome-os-partner:5851
TEST=(1) get an Alex with bios WP=off, ec WP=on
(2) boot with factory install shim
(3) Seeing TPM cleared message
Change-Id: I887d6ff56e917349843053c999cace4b9abb525b
Reviewed-on: http://gerrit.chromium.org/gerrit/8187
Reviewed-by: Tammo Spalink <tammo@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/factory_install.sh b/factory_install.sh
index bb2afee..303bf6e 100644
--- a/factory_install.sh
+++ b/factory_install.sh
@@ -189,7 +189,6 @@
# Clear software firmware write protect.
clear_fwwp
fi
- ensure_fwwp_consistency
log "Checking if TPM should be cleared"
# To clear TPM, we need both software firmware write protect to be off, and
@@ -220,6 +219,7 @@
# Alert for a while
sleep 3
fi
+ ensure_fwwp_consistency
}
get_dst_drive() {
