summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-14 05:08:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-14 05:08:42 +0000
commit9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31 (patch)
tree64052dd3c3d6e69f2aa8588d5a60ad2782f0036c /rootdir
parentc3d2793f6f89391285a2d65cbf85c3eab252ba8d (diff)
parent29576ae8901eb95d4c8a34f242a282b2fb73d35f (diff)
downloadsystem_core-9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31.zip
system_core-9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31.tar.gz
system_core-9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31.tar.bz2
am 29576ae8: Merge "/vendor is sometimes on a separate partition now."
* commit '29576ae8901eb95d4c8a34f242a282b2fb73d35f': /vendor is sometimes on a separate partition now.
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc5
1 files changed, 2 insertions, 3 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index ce7e0a9..e455c38 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -34,12 +34,11 @@ on init
loglevel 3
- # Backward compatibility
+ # Backward compatibility.
symlink /system/etc /etc
symlink /sys/kernel/debug /d
- # Right now vendor lives on the same filesystem as system,
- # but someday that may change.
+ # Link /vendor to /system/vendor for devices without a vendor partition.
symlink /system/vendor /vendor
# Create cgroup mount point for cpu accounting