Revert "Create new mount directory /mnt/runtime/full."
This reverts commit 987e732fe8
.
Reason for revert: 122957837
Change-Id: Ib1451d46a05f34eb52fdc13143529913df5ec001
This commit is contained in:
parent
987e732fe8
commit
54b8844b13
2 changed files with 2 additions and 11 deletions
|
@ -117,8 +117,6 @@ on init
|
|||
mkdir /mnt/runtime/read/self 0755 root root
|
||||
mkdir /mnt/runtime/write 0755 root root
|
||||
mkdir /mnt/runtime/write/self 0755 root root
|
||||
mkdir /mnt/runtime/full 0755 root root
|
||||
mkdir /mnt/runtime/full/self 0755 root root
|
||||
|
||||
# Symlink to keep legacy apps working in multi-user world
|
||||
symlink /storage/self/primary /sdcard
|
||||
|
|
|
@ -160,7 +160,6 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
|
|||
std::string dest_path_default = "/mnt/runtime/default/" + label;
|
||||
std::string dest_path_read = "/mnt/runtime/read/" + label;
|
||||
std::string dest_path_write = "/mnt/runtime/write/" + label;
|
||||
std::string dest_path_full = "/mnt/runtime/full/" + label;
|
||||
|
||||
umask(0);
|
||||
if (multi_user) {
|
||||
|
@ -173,10 +172,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
|
|||
default_normal, use_esdfs) ||
|
||||
!sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid,
|
||||
multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0027,
|
||||
derive_gid, default_normal, use_esdfs) ||
|
||||
!sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_full, uid, gid,
|
||||
multi_user, userid, AID_EVERYBODY, 0007, derive_gid,
|
||||
default_normal, use_esdfs)) {
|
||||
derive_gid, default_normal, use_esdfs)) {
|
||||
LOG(FATAL) << "failed to sdcardfs_setup";
|
||||
}
|
||||
} else {
|
||||
|
@ -190,10 +186,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
|
|||
derive_gid, default_normal, use_esdfs) ||
|
||||
!sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid,
|
||||
multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0022,
|
||||
derive_gid, default_normal, use_esdfs) ||
|
||||
!sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_full, uid, gid,
|
||||
multi_user, userid, AID_EVERYBODY, 0007, derive_gid,
|
||||
default_normal, use_esdfs)) {
|
||||
derive_gid, default_normal, use_esdfs)) {
|
||||
LOG(FATAL) << "failed to sdcardfs_setup";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue