Mark the active slot from update_engine instead of /postinstall.
In Chrome OS, we were reliying on the /postinst script to generate the
verity hashes and mark the new kernel as bootable. This means that we
also need to run /postinst from the other (not verified) slot when
doing a user-initiated rollback. The update_engine already interacts
with the bootloader via the BootControlInterface to mark the other slot
as unbootable and check if there are other slots available for
rollback.
This patch moves the responsibility of marking the new slot as bootable
from the /postinst script to the update_engine, introducing a new
SetActiveBootSlot() method in the BootControlInterface. Chrome OS
builds will continue to mark the new slot as active from /postinstall
in order to be compatible with old builds, resulting in the new slot
marked as active twice during a successful normal update.
Bug: 23523562
Test: cros flash and image to the new daemon; rolled it back
Change-Id: I02502d7b8e85523a6eb9a7721053739e8381d266
diff --git a/postinstall_runner_action.h b/postinstall_runner_action.h
index 421ed01..c56218a 100644
--- a/postinstall_runner_action.h
+++ b/postinstall_runner_action.h
@@ -21,6 +21,7 @@
#include "update_engine/action.h"
#include "update_engine/install_plan.h"
+#include "update_engine/system_state.h"
// The Postinstall Runner Action is responsible for running the postinstall
// script of a successfully downloaded update.
@@ -29,9 +30,8 @@
class PostinstallRunnerAction : public InstallPlanAction {
public:
- PostinstallRunnerAction()
- : powerwash_marker_created_(false),
- powerwash_marker_file_(nullptr) {}
+ explicit PostinstallRunnerAction(SystemState* system_state)
+ : PostinstallRunnerAction(system_state, nullptr) {}
void PerformAction();
@@ -43,6 +43,14 @@
std::string Type() const { return StaticType(); }
private:
+ friend class PostinstallRunnerActionTest;
+
+ // Special constructor used for testing purposes.
+ PostinstallRunnerAction(SystemState* system_state,
+ const char* powerwash_marker_file)
+ : system_state_(system_state),
+ powerwash_marker_file_(powerwash_marker_file) {}
+
// Subprocess::Exec callback.
void CompletePostinstall(int return_code,
const std::string& output);
@@ -50,21 +58,17 @@
InstallPlan install_plan_;
std::string temp_rootfs_dir_;
+ // The main SystemState singleton.
+ SystemState* system_state_;
+
// True if Powerwash Marker was created before invoking post-install script.
// False otherwise. Used for cleaning up if post-install fails.
- bool powerwash_marker_created_;
+ bool powerwash_marker_created_ = false;
// Non-null value will cause post-install to override the default marker
// file name; used for testing.
const char* powerwash_marker_file_;
- // Special ctor + friend declaration for testing purposes.
- explicit PostinstallRunnerAction(const char* powerwash_marker_file)
- : powerwash_marker_created_(false),
- powerwash_marker_file_(powerwash_marker_file) {}
-
- friend class PostinstallRunnerActionTest;
-
DISALLOW_COPY_AND_ASSIGN(PostinstallRunnerAction);
};