tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: allow using the recovery image for 1st stage init"

Browse source
This commit is contained in:
Tom Cherry 2018-09-13 23:46:14 +00:00 committed by Gerrit Code Review
commit 11b4cde8be
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
init/first_stage_mount.cpp
View file

@ -120,8 +120,14 @@ static inline bool IsDtVbmetaCompatible() {
return is_android_dt_value_expected("vbmeta/compatible", "android,vbmeta");
}
static bool inline IsRecoveryMode() {
return access("/system/bin/recovery", F_OK) == 0;
static bool IsRecoveryMode() {
static bool force_normal_boot = []() {
std::string cmdline;
android::base::ReadFileToString("/proc/cmdline", &cmdline);
return cmdline.find("androidboot.force_normal_boot=1") != std::string::npos;
}();
return !force_normal_boot && access("/system/bin/recovery", F_OK) == 0;
}
static inline bool IsDmLinearEnabled() {
@ -362,14 +368,16 @@ bool FirstStageMount::MountPartitions() {
// this case, we mount system first then pivot to it. From that point on,
// we are effectively identical to a system-as-root device.
auto system_partition =
std::find_if(mount_fstab_recs_.begin(), mount_fstab_recs_.end(),
[](const auto& rec) { return rec->mount_point == "/system"s; });
std::find_if(mount_fstab_recs_.begin(), mount_fstab_recs_.end(), [](const auto& rec) {
return rec->mount_point == "/system"s ||
rec->mount_point == "/system_recovery_mount"s;
});
if (system_partition != mount_fstab_recs_.end()) {
if (!MountPartition(*system_partition)) {
return false;
}
SwitchRoot("/system");
SwitchRoot((*system_partition)->mount_point);
mount_fstab_recs_.erase(system_partition);
}