Merge remote-tracking branch 'LineageOS/lineage-21.0' into lineage-21.0

LineageOS-UL · Jul 7, 2024 · fd9c304 · fd9c304
2 parents d735a46 + 7a568f1
commit fd9c304
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
@@ -82,7 +82,11 @@
 #define TUNE2FS_BIN     "/system/bin/tune2fs"
 #define RESIZE2FS_BIN "/system/bin/resize2fs"
 
+#ifdef __ANDROID_RECOVERY__
+#define FSCK_LOG_FILE   "/dev/null"
+#else
 #define FSCK_LOG_FILE   "/dev/fscklogs/log"
+#endif
 
 #define ZRAM_CONF_DEV   "/sys/block/zram0/disksize"
 #define ZRAM_CONF_MCS   "/sys/block/zram0/max_comp_streams"

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
@@ -1043,8 +1043,8 @@ bool MetadataBuilder::UpdateBlockDeviceInfo(size_t index, const BlockDeviceInfo&
     CHECK(index < block_devices_.size());
 
     LpMetadataBlockDevice& block_device = block_devices_[index];
-    if (device_info.size != block_device.size) {
-        LERROR << "Device size does not match (got " << device_info.size << ", expected "
+    if (device_info.size < block_device.size) {
+        LERROR << "Device size does not fit (got " << device_info.size << ", expected "
                << block_device.size << ")";
         return false;
     }

diff --git a/init/devices.cpp b/init/devices.cpp
@@ -407,7 +407,8 @@ std::vector<std::string> DeviceHandler::GetBlockDeviceSymlinks(const Uevent& uev
 
     auto link_path = "/dev/block/" + type + "/" + device;
 
-    bool is_boot_device = boot_devices_.find(device) != boot_devices_.end();
+    bool is_boot_device = boot_devices_.find(device) != boot_devices_.end() ||
+        boot_devices_.find("any") != boot_devices_.end();
     if (!uevent.partition_name.empty()) {
         std::string partition_name_sanitized(uevent.partition_name);
         SanitizePartitionName(&partition_name_sanitized);