summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-15 09:29:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-15 09:29:08 -0800
commit2568437271daf668b69fa866cc6f38bc3cd888e5 (patch)
tree3528b663bdc497f0f916823d02495120c07df587
parent0589d96bbe85069577f00de0b75a8031f2457c01 (diff)
parent91f6fb6ce8ba4c19a1268a9ecc244ad38875720c (diff)
downloaddiskinstaller-2568437271daf668b69fa866cc6f38bc3cd888e5.tar.gz
am 91f6fb6c: Merge "Make the /system/bin/sh link so installer.c works."
* commit '91f6fb6ce8ba4c19a1268a9ecc244ad38875720c': Make the /system/bin/sh link so installer.c works.
-rw-r--r--config.mk2
-rw-r--r--init.rc1
2 files changed, 2 insertions, 1 deletions
diff --git a/config.mk b/config.mk
index 11f17fc..c01d188 100644
--- a/config.mk
+++ b/config.mk
@@ -12,7 +12,7 @@ android_sysbase_modules := \
libm \
libstdc++ \
linker \
- sh \
+ ash \
toolbox \
logcat \
gdbserver \
diff --git a/init.rc b/init.rc
index 48cf3ca..5ba0f18 100644
--- a/init.rc
+++ b/init.rc
@@ -4,6 +4,7 @@ on init
export ANDROID_DATA /data
symlink /system/etc /etc
+ symlink /system/bin/ash /system/bin/sh
mkdir /data
mkdir /cache