commit 44f912a654ab873a9dfe4e52e6447dc0d8f6ddd1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 01:39:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 01:39:49 2020 +0000
tree ad3f395f300ce18545eac475feb36896f7ff9528
parent 6e9e22711f54ae999d6691dc1306c00cdbae3c6b
parent 8fda5feb254f112120aa494fd81d203b3b399437

Merge "symlink /dev/net/tun -> ../tun" am: 8fda5feb25

Change-Id: I41f02949c240e0a581d0e87b35181644f4faa50f

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 12b9c20..20fb071 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