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

Commit 589afaa8 authored by Abdelrahman Daim's avatar Abdelrahman Daim
Browse files

fs_mgr: Support nosymfollow mount option 



Summary: The nosymfollow mount option was added to Linux 5.10, and the bionic
headers support it. Allow mounting with the option set. Updated relevant
CTS test too.

Test: Successful build on master

Change-Id: I0b280287e07ef8c485762b820dbbb26300144982
Signed-off-by: default avatarAbdelrahman Daim <adaim@meta.com>
parent 7adba598

fs_mgr/libfstab/fstab.cpp

+1 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ 
#include "fstab_priv.h"

#include "logging_macros.h"



#if !defined(MS_LAZYTIME)

#define MS_LAZYTIME (1 << 25)

#endif



using android::base::EndsWith;

using android::base::ParseByteCount;

using android::base::ParseInt;
@@ -79,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
@@ -334,6 +334,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 },

};