Removes the need for additional reboot in Lucas
This CL is a fix for the Issue 273264.
An enumeration of the state table is provided below.
TPM OK IA Behaviour
Clear Exists Exists Not possible, since OK is in statefull partition which cannot be accessed when TPM is cleared.
Clear !Exists Exists Reenrollment scenario -> serial key created
Clear !Exists !Exists Enrollment scenario -> serial key created
Clear Exists !Exists Not possible, since OK is in statefull partition which cannot be accessed when TPM is cleared.
!Clear Exists Exists Regular use scenario -> serial key not created
!Clear !Exists Exists Reenrollment scenario -> serial key created
!Clear Exists !Exists Not Possible, OK only gets created after we take TPM ownership, which creates IA
!Clear !Exists !Exists Reenrollment scenario -> serial key created
BUG=chromium:273264
TEST=Verified the change on Lucas
Change-Id: I7e59adbf9b50971caba527958f5d59cb64df8cd9
Previous-Reviewed-on: https://chromium-review.googlesource.com/192300
(cherry picked from commit 27be61c39d986e551782671df7670bca1653aecb)
Reviewed-on: https://chromium-review.googlesource.com/195130
Reviewed-by: Mattias Nissler <mnissler@chromium.org>
Commit-Queue: Mattias Nissler <mnissler@chromium.org>
Tested-by: Mattias Nissler <mnissler@chromium.org>
diff --git a/init/machine-info.conf b/init/machine-info.conf
index a006e26..cdeb3e2 100644
--- a/init/machine-info.conf
+++ b/init/machine-info.conf
@@ -34,8 +34,7 @@
# of the ui job.
pre-start script
if [ -e /var/lib/enterprise_serial_number_recovery -o \
- \( ! -e /home/.shadow/install_attributes.pb -a \
- ! -e /var/lib/whitelist/owner.key \) ]; then
+ ! -e /var/lib/whitelist/owner.key ]; then
touch $MACHINE_INFO
chmod 0644 $MACHINE_INFO
if crossystem "mainfw_type?nonchrome"; then