commit 8952ee26ae76996042a84ac019a152b8cb5411bf
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 01:52:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 01:52:54 2020 +0000
tree ad3f395f300ce18545eac475feb36896f7ff9528
parent 4d6a09fd4cc4904fdfbaedbf07f735aed4c7e44e
parent 37e3ca0c42213a040352566ba463f6f22c690d05

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

Change-Id: Ibdf2075f3b0baaf63d368ba16f440a432fbdaaed

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