openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs_mgr: remount reboot if overlayfs got setup 

Cosmetic fix.

If overlayfs gets setup by the remount command, ask user to reboot
since the device is not 100% in a state to run, and is merely only
in a state to take push and sync operations.

overlayfs is only truly ready for developing and running if the
overly mounts had occurred in first stage init, this happens when
the device is rebooted.

We did not completely remove overlapping dead ext4 dedupe code in a
previous change, complete the process.

Simplification for adb remount, the message:

    Now reboot your device for settings to take effect

will only occur on the pass that causes the overlays to be populated,
in the same boot session. If subsequent, and ineffectual in any case,
remount command occurs again, it will not request a reboot.

Test: adb-remount-test.sh
Bug: 130131892
Change-Id: I7c4f408546687c49249883e2641b9bc63f68afd0
This commit is contained in:
Mark Salyzyn 2019-05-28 08:55:48 -07:00
parent 719790f560
commit d9b60303a0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs_mgr/fs_mgr_remount.cpp
View File

@ -93,14 +93,14 @@ void MyLogger(android::base::LogId id, android::base::LogSeverity severity, cons
logd(id, severity, tag, file, line, message);
}
[[noreturn]] void reboot(bool dedupe) {
if (dedupe) {
LOG(INFO) << "The device will now reboot to recovery and attempt un-deduplication.";
[[noreturn]] void reboot(bool overlayfs = false) {
if (overlayfs) {
LOG(INFO) << "Successfully setup overlayfs\nrebooting device";
} else {
LOG(INFO) << "Successfully disabled verity\nrebooting device";
}
::sync();
android::base::SetProperty(ANDROID_RB_PROPERTY, dedupe ? "reboot,recovery" : "reboot,remount");
android::base::SetProperty(ANDROID_RB_PROPERTY, "reboot,remount");
::sleep(60);
::exit(0); // SUCCESS
}
@ -251,6 +251,7 @@ int main(int argc, char* argv[]) {
auto reboot_later = false;
auto user_please_reboot_later = false;
auto uses_overlayfs = fs_mgr_overlayfs_valid() != OverlayfsValidResult::kNotSupported;
auto setup_overlayfs = false;
for (auto it = partitions.begin(); it != partitions.end();) {
auto& entry = *it;
auto& mount_point = entry.mount_point;
@ -271,7 +272,7 @@ int main(int argc, char* argv[]) {
++it;
continue;
}
reboot(false);
reboot();
}
user_please_reboot_later = true;
} else if (fs_mgr_set_blk_ro(entry.blk_device, false)) {
@ -298,6 +299,9 @@ int main(int argc, char* argv[]) {
if (fs_mgr_overlayfs_setup(nullptr, mount_point.c_str(), &change)) {
if (change) {
LOG(INFO) << "Using overlayfs for " << mount_point;
reboot_later = can_reboot;
user_please_reboot_later = true;
setup_overlayfs = true;
}
} else if (errno) {
PLOG(ERROR) << "Overlayfs setup for " << mount_point << " failed, skipping";
@ -309,7 +313,7 @@ int main(int argc, char* argv[]) {
}
if (partitions.empty()) {
if (reboot_later) reboot(false);
if (reboot_later) reboot(setup_overlayfs);
if (user_please_reboot_later) {
LOG(INFO) << "Now reboot your device for settings to take effect";
return 0;
@ -389,7 +393,7 @@ int main(int argc, char* argv[]) {
retval = REMOUNT_FAILED;
}
if (reboot_later) reboot(false);
if (reboot_later) reboot(setup_overlayfs);
if (user_please_reboot_later) {
LOG(INFO) << "Now reboot your device for settings to take effect";
return 0;