commit fd1e8b2f10e7aaa7ef3cdac973f37825d15816a0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 03 18:50:11 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 03 18:50:11 2024 +0000
tree d88db6cd339ab7b736b435aa3339cc4d46f2696e
parent 11c2fedb4dd093111b7d86547029561fd3284592
parent 0b0b273f428b3dd03b44b5bd70d2b8bf383a3a0d

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

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

Change-Id: I50211159a8c118c43bb94a1662d5e2e0ac64bf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libfstab/fstab.cpp

diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp
index 01e0e3d..010fbc8 100644
--- a/fs_mgr/libfstab/fstab.cpp
+++ b/fs_mgr/libfstab/fstab.cpp
@@ -75,6 +75,7 @@
         {"slave", MS_SLAVE},
         {"shared", MS_SHARED},
         {"lazytime", MS_LAZYTIME},
+        {"nosymfollow", MS_NOSYMFOLLOW},
         {"defaults", 0},
 };
 

fs_mgr/tests/fs_mgr_test.cpp

diff --git a/fs_mgr/tests/fs_mgr_test.cpp b/fs_mgr/tests/fs_mgr_test.cpp
index 8004977..fc3d5dc 100644
--- a/fs_mgr/tests/fs_mgr_test.cpp
+++ b/fs_mgr/tests/fs_mgr_test.cpp
@@ -330,6 +330,7 @@
                 {"slave", MS_SLAVE},
                 {"shared", MS_SHARED},
                 {"lazytime", MS_LAZYTIME},
+                {"nosymfollow", MS_NOSYMFOLLOW},
                 {"defaults", 0},
                 {0, 0},
         };

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index c4af5b5..38aed9c 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -471,6 +471,7 @@
     { "private",    MS_PRIVATE },
     { "slave",      MS_SLAVE },
     { "shared",     MS_SHARED },
+    { "nosymfollow", MS_NOSYMFOLLOW },
     { "defaults",   0 },
     { 0,            0 },
 };