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

Merge "fs_mgr: Support nosymfollow mount option" into main am: 92487860cf

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3368571

Change-Id: I82b1d4118294d26033ba8decee4482be71d5bd95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-12-03 17:36:16 +00:00 • committed by Automerger Merge Worker
commit 0b0b273f42
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs_mgr/libfstab/fstab.cpp
View file

@ -75,6 +75,7 @@ FlagList kMountFlagsList[] = {
{"slave", MS_SLAVE}, {"slave", MS_SLAVE},
{"shared", MS_SHARED}, {"shared", MS_SHARED},
{"lazytime", MS_LAZYTIME}, {"lazytime", MS_LAZYTIME},
{"nosymfollow", MS_NOSYMFOLLOW},
{"defaults", 0}, {"defaults", 0},
}; };

1
fs_mgr/tests/fs_mgr_test.cpp
View file

@ -330,6 +330,7 @@ TEST(fs_mgr, fs_mgr_read_fstab_file_proc_mounts) {
{"slave", MS_SLAVE}, {"slave", MS_SLAVE},
{"shared", MS_SHARED}, {"shared", MS_SHARED},
{"lazytime", MS_LAZYTIME}, {"lazytime", MS_LAZYTIME},
{"nosymfollow", MS_NOSYMFOLLOW},
{"defaults", 0}, {"defaults", 0},
{0, 0}, {0, 0},
}; };

1
init/builtins.cpp
View file

@ -471,6 +471,7 @@ static struct {
{ "private", MS_PRIVATE }, { "private", MS_PRIVATE },
{ "slave", MS_SLAVE }, { "slave", MS_SLAVE },
{ "shared", MS_SHARED }, { "shared", MS_SHARED },
{ "nosymfollow", MS_NOSYMFOLLOW },
{ "defaults", 0 }, { "defaults", 0 },
{ 0, 0 }, { 0, 0 },
}; };