Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b0b273f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I82b1d4118294d26033ba8decee4482be71d5bd95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f670036b 92487860

fs_mgr/libfstab/fstab.cpp

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ FlagList kMountFlagsList[] = { 
        {"slave", MS_SLAVE},

        {"shared", MS_SHARED},

        {"lazytime", MS_LAZYTIME},

        {"nosymfollow", MS_NOSYMFOLLOW},

        {"defaults", 0},

};

fs_mgr/tests/fs_mgr_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ TEST(fs_mgr, fs_mgr_read_fstab_file_proc_mounts) { 
                {"slave", MS_SLAVE},

                {"shared", MS_SHARED},

                {"lazytime", MS_LAZYTIME},

                {"nosymfollow", MS_NOSYMFOLLOW},

                {"defaults", 0},

                {0, 0},

        };

init/builtins.cpp

+1 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ static struct { 
    { "private",    MS_PRIVATE },

    { "slave",      MS_SLAVE },

    { "shared",     MS_SHARED },

    { "nosymfollow", MS_NOSYMFOLLOW },

    { "defaults",   0 },

    { 0,            0 },

};