summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-05-17 07:14:39 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-05-17 07:14:39 +0000
commit80afc90f26a0776f10e0b229acbaa9bf599ad7f2 (patch)
tree8ae7649c309acab0e3b2180ef2e0fc8b3f6212bd
parent269c4db367e05f6a304b68dd6dd36a5fffb525e6 (diff)
parenteaefa59d22747d74fce7a3f40b93995d67f3c9ec (diff)
downloadtests-80afc90f26a0776f10e0b229acbaa9bf599ad7f2.tar.gz
Snap for 6502793 from eaefa59d22747d74fce7a3f40b93995d67f3c9ec to mainline-release
Change-Id: Id5ba116f8696976b33314a0b992333be5af0d5a1
-rw-r--r--net/test/namespace.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/net/test/namespace.py b/net/test/namespace.py
index 4533b5d..1144892 100644
--- a/net/test/namespace.py
+++ b/net/test/namespace.py
@@ -22,6 +22,12 @@ import os
import net_test
+# //include/linux/fs.h
+MNT_FORCE = 1 # Attempt to forcibily umount
+MNT_DETACH = 2 # Just detach from the tree
+MNT_EXPIRE = 4 # Mark for expiry
+UMOUNT_NOFOLLOW = 8 # Don't follow symlink on umount
+
# //include/uapi/linux/fs.h
MS_RDONLY = 1 # Mount read-only
MS_NOSUID = 2 # Ignore suid and sgid bits
@@ -62,7 +68,7 @@ libc = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)
libc.mount.argtypes = (ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p,
ctypes.c_ulong, ctypes.c_void_p)
libc.sethostname.argtype = (ctypes.c_char_p, ctypes.c_size_t)
-libc.umount.argtypes = (ctypes.c_char_p,)
+libc.umount2.argtypes = (ctypes.c_char_p, ctypes.c_int)
libc.unshare.argtypes = (ctypes.c_int,)
@@ -75,12 +81,12 @@ def Mount(src, tgt, fs, flags=MS_NODEV|MS_NOEXEC|MS_NOSUID|MS_RELATIME):
def ReMountProc():
- libc.umount('/proc') # Ignore failure: might not be mounted
+ libc.umount2('/proc', MNT_DETACH) # Ignore failure: might not be mounted
Mount('proc', '/proc', 'proc')
def ReMountSys():
- libc.umount('/sys') # Ignore failure: might not be mounted
+ libc.umount2('/sys', MNT_DETACH) # Ignore failure: might not be mounted
Mount('sysfs', '/sys', 'sysfs')