ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Reland "Create new mount directory /mnt/runtime/full."" am: c39ed35d82

Browse source 
am: 5e4c507abd

Change-Id: I0bf17576c20118901b72aa14fd81de94f2453e40
This commit is contained in:
Sudheer Shanka 2019-01-18 17:17:25 -08:00 • committed by android-build-merger
commit ec21712d16
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rootdir/init.rc
View file

@ -109,6 +109,8 @@ on init
mkdir /mnt/runtime/read/self 0755 root root mkdir /mnt/runtime/read/self 0755 root root
mkdir /mnt/runtime/write 0755 root root mkdir /mnt/runtime/write 0755 root root
mkdir /mnt/runtime/write/self 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 to keep legacy apps working in multi-user world
symlink /storage/self/primary /sdcard symlink /storage/self/primary /sdcard

11
sdcard/sdcard.cpp
View file

@ -160,6 +160,7 @@ 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_default = "/mnt/runtime/default/" + label;
std::string dest_path_read = "/mnt/runtime/read/" + label; std::string dest_path_read = "/mnt/runtime/read/" + label;
std::string dest_path_write = "/mnt/runtime/write/" + label; std::string dest_path_write = "/mnt/runtime/write/" + label;
std::string dest_path_full = "/mnt/runtime/full/" + label;
umask(0); umask(0);
if (multi_user) { if (multi_user) {
@ -172,7 +173,10 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
default_normal, use_esdfs) || default_normal, use_esdfs) ||
!sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid, !sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid,
multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0027, multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0027,
derive_gid, default_normal, use_esdfs)) { 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)) {
LOG(FATAL) << "failed to sdcardfs_setup"; LOG(FATAL) << "failed to sdcardfs_setup";
} }
} else { } else {
@ -186,7 +190,10 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
derive_gid, default_normal, use_esdfs) || derive_gid, default_normal, use_esdfs) ||
!sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid, !sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid,
multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0022, multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0022,
derive_gid, default_normal, use_esdfs)) { 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)) {
LOG(FATAL) << "failed to sdcardfs_setup"; LOG(FATAL) << "failed to sdcardfs_setup";
} }
} }