android root: restore context for android system root
In this patchset we will store and reset the android system
root context after a wipe and restore to prevent issues
with no context labels in the file_contexts being applied.
This will prevent no boot issues in android with selinux
denials on the system root partition.
Change-Id: I87fd3a6060fbaa3e7bdfd7a4b1d09feeb4fa3f27
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 6432524..e29ffaf 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -740,5 +740,6 @@
<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
+ <string name="restore_system_context">Unable to get default context for {1} -- Android may not boot.</string>
</resources>
</language>
diff --git a/partition.cpp b/partition.cpp
index 17614ff..b55cf49 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1664,6 +1664,12 @@
if (Mount_Point == "/cache")
Log_Offset = 0;
+ if (Mount_Point == PartitionManager.Get_Android_Root_Path()) {
+ if (tw_get_default_metadata(PartitionManager.Get_Android_Root_Path().c_str()) != 0) {
+ gui_msg(Msg(msg::kWarning, "restore_system_context=Unable to get default context for {1} -- Android may not boot.")(PartitionManager.Get_Android_Root_Path()));
+ }
+ }
+
if (Retain_Layout_Version && Mount(false) && TWFunc::Path_Exists(Layout_Filename))
TWFunc::copy_file(Layout_Filename, "/.layout_version", 0600);
else
@@ -1708,6 +1714,9 @@
if (Mount_Point == "/cache" && TWFunc::get_log_dir() != DATA_LOGS_DIR)
DataManager::Output_Version();
+ if (Mount_Point == PartitionManager.Get_Android_Root_Path()) {
+ tw_set_default_metadata(PartitionManager.Get_Android_Root_Path().c_str());
+ }
if (TWFunc::Path_Exists("/.layout_version") && Mount(false))
TWFunc::copy_file("/.layout_version", Layout_Filename, 0600);
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 30bdf3e..97b708b 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1128,6 +1128,10 @@
string Full_Filename = part_settings.Backup_Folder + "/" + part_settings.Part->Backup_FileName;
+ if (tw_get_default_metadata(Get_Android_Root_Path().c_str()) != 0) {
+ gui_msg(Msg(msg::kWarning, "restore_system_context=Unable to get default context for {1} -- Android may not boot.")(Get_Android_Root_Path()));
+ }
+
if (check_digest > 0 && !twrpDigestDriver::Check_Digest(Full_Filename))
return false;
part_settings.partition_count++;
@@ -1183,6 +1187,7 @@
}
}
TWFunc::GUI_Operation_Text(TW_UPDATE_SYSTEM_DETAILS_TEXT, gui_parse_text("{@updating_system_details}"));
+ tw_set_default_metadata(Get_Android_Root_Path().c_str());
UnMount_By_Path(Get_Android_Root_Path(), false);
Update_System_Details();
UnMount_Main_Partitions();