Changes for May 2024, syncing up to 20240508
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 7892af1ca6193fcc9ebba0d8bafe6e8a741856c5 Mon Sep 17 00:00:00 2001
|
||||
From 09d951c1c516c55eb10fd8e68d27715b24b08207 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 17 Feb 2018 19:39:38 +0100
|
||||
Subject: [PATCH 1/5] Allow deletion of symlink
|
||||
@@ -9,10 +9,10 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
|
||||
index bbaf429..94e5201 100644
|
||||
index 9f6403c7..b020318a 100644
|
||||
--- a/FsCrypt.cpp
|
||||
+++ b/FsCrypt.cpp
|
||||
@@ -359,6 +359,7 @@ static bool prepare_dir_with_policy(const std::string& dir, mode_t mode, uid_t u
|
||||
@@ -378,6 +378,7 @@ static bool prepare_dir_with_policy(const std::string& dir, mode_t mode, uid_t u
|
||||
static bool destroy_dir(const std::string& dir) {
|
||||
LOG(DEBUG) << "Destroying: " << dir;
|
||||
if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {
|
||||
@@ -21,5 +21,5 @@ index bbaf429..94e5201 100644
|
||||
return false;
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d61316b5f00c32b649d24d4defb196d9ddc99d03 Mon Sep 17 00:00:00 2001
|
||||
From 95fedbd400701d064250ba91ea1ab2def4111421 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 7 Mar 2020 14:49:09 +0100
|
||||
Subject: [PATCH 2/5] Failing to create facedata shouldn't be fatal
|
||||
@@ -12,10 +12,10 @@ See https://github.com/phhusson/treble_experimentations/issues/1119
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
|
||||
index 60e82f5..c1ded02 100644
|
||||
index e82a7c2d..de5583f4 100644
|
||||
--- a/vold_prepare_subdirs.cpp
|
||||
+++ b/vold_prepare_subdirs.cpp
|
||||
@@ -205,7 +205,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
|
||||
@@ -208,7 +208,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
|
||||
}
|
||||
auto facedata_path = vendor_de_path + "/facedata";
|
||||
if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, facedata_path)) {
|
||||
@@ -24,7 +24,7 @@ index 60e82f5..c1ded02 100644
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -254,7 +254,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
|
||||
@@ -257,7 +257,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
|
||||
auto vendor_ce_path = android::vold::BuildDataVendorCePath(user_id);
|
||||
auto facedata_path = vendor_ce_path + "/facedata";
|
||||
if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, facedata_path)) {
|
||||
@@ -34,5 +34,5 @@ index 60e82f5..c1ded02 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 906fbe7e96851a950fb1401b0077fb15a348e6b2 Mon Sep 17 00:00:00 2001
|
||||
From 1542c0c97d8956fe116a937138f79ee5d725a3e9 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 29 Nov 2021 17:49:13 -0500
|
||||
Subject: [PATCH 3/5] Don't unmount rw-system.sh binds
|
||||
@@ -9,10 +9,10 @@ Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
|
||||
index dc6fae9..47c8cd4 100644
|
||||
index c981f2d4..ce2a4510 100644
|
||||
--- a/VolumeManager.cpp
|
||||
+++ b/VolumeManager.cpp
|
||||
@@ -985,6 +985,7 @@ int VolumeManager::unmountAll() {
|
||||
@@ -1000,6 +1000,7 @@ int VolumeManager::unmountAll() {
|
||||
while ((mentry = getmntent(fp)) != NULL) {
|
||||
auto test = std::string(mentry->mnt_dir);
|
||||
if ((StartsWith(test, "/mnt/") &&
|
||||
@@ -21,5 +21,5 @@ index dc6fae9..47c8cd4 100644
|
||||
!StartsWith(test, "/mnt/scratch") &&
|
||||
#endif
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bf0b19afc1bf8bad9a676d520f3fd5d81bb1f7cd Mon Sep 17 00:00:00 2001
|
||||
From 8ace1f37a88088486cd0f3c90ca57ac4293de5bd Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 11 Mar 2020 14:02:35 +0100
|
||||
Subject: [PATCH 5/5] Every voldmanaged storage is adoptable
|
||||
@@ -8,10 +8,10 @@ Subject: [PATCH 5/5] Every voldmanaged storage is adoptable
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index e2025b7..8a02279 100644
|
||||
index 078ee14b..475060dc 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -279,7 +279,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
|
||||
@@ -269,7 +269,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
|
||||
std::string nickname(entry.label);
|
||||
int flags = 0;
|
||||
|
||||
@@ -21,5 +21,5 @@ index e2025b7..8a02279 100644
|
||||
configs->has_adoptable = true;
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user