Index: main.cc |
diff --git a/main.cc b/main.cc |
index 48ea9f17e3405002245e0832f0a88bcc616f62a2..769850ca6f62d0d5ddf5936c0d2794391a9ff7bc 100755 |
--- a/main.cc |
+++ b/main.cc |
@@ -41,21 +41,7 @@ namespace chromeos_update_engine { |
gboolean UpdateBootFlags(void* arg) { |
UpdateAttempter* attempter = reinterpret_cast<UpdateAttempter*>(arg); |
- if (attempter->status() == UPDATE_STATUS_UPDATED_NEED_REBOOT) { |
- // Don't update the flags if there's an update that's just been applied and |
- // we're waiting for reboot because we may end up reverting the update. |
- return FALSE; // Don't call this callback again. |
- } |
- if (attempter->status() != UPDATE_STATUS_IDLE) { |
- // To avoid races (e.g., setting a good kernel right after post-install but |
- // before the status changes), update the boot flag only if the attempter is |
- // idle. |
- return TRUE; // Call this callback again. |
- } |
- // This is purely best effort. Failures should be logged by Subprocess. |
- int unused = 0; |
- vector<string> cmd(1, "/usr/sbin/chromeos-setgoodkernel"); |
- Subprocess::SynchronousExec(cmd, &unused); |
+ attempter->UpdateBootFlags(); |
return FALSE; // Don't call this callback again |
} |