commit ef0cdbe55367b83bb019d09e09a93a19830106bc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 02:06:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 02:06:38 2020 +0000
tree 71ad16ad1e89f251774e80dd64e26e69d386300f
parent 24b27635600cbeb5bfeb6092b66ee7339989fb35
parent 8952ee26ae76996042a84ac019a152b8cb5411bf

Merge "symlink /dev/net/tun -> ../tun" am: 8fda5feb25 am: 44f912a654 am: 16d9657e7b

Change-Id: Iea43d9914a274db983e2d60595ebfe4db507d137

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 5f4b8c3..c9a8e0c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -32,6 +32,10 @@
     # cgroup for system_server and surfaceflinger
     mkdir /dev/memcg/system 0550 system system
 
+    # symlink the Android specific /dev/tun to Linux expected /dev/net/tun
+    mkdir /dev/net 0755 root root
+    symlink ../tun /dev/net/tun
+
     # set RLIMIT_NICE to allow priorities from 19 to -20
     setrlimit nice 40 40