Merge "change files in /dev/log/ to 666"
diff --git a/init/builtins.c b/init/builtins.c
index adad353..0b9c0cf 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -75,12 +75,23 @@
}
}
+static int _open(const char *path)
+{
+ int fd;
+
+ fd = open(path, O_RDONLY | O_NOFOLLOW);
+ if (fd < 0)
+ fd = open(path, O_WRONLY | O_NOFOLLOW);
+
+ return fd;
+}
+
static int _chown(const char *path, unsigned int uid, unsigned int gid)
{
int fd;
int ret;
- fd = open(path, O_RDONLY | O_NOFOLLOW);
+ fd = _open(path);
if (fd < 0) {
return -1;
}
@@ -103,7 +114,7 @@
int fd;
int ret;
- fd = open(path, O_RDONLY | O_NOFOLLOW);
+ fd = _open(path);
if (fd < 0) {
return -1;
}
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8520854..71ec3fa 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -30,7 +30,7 @@
export ANDROID_DATA /data
export ASEC_MOUNTPOINT /mnt/asec
export LOOP_MOUNTPOINT /mnt/obb
- export BOOTCLASSPATH /system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar:/system/framework/filterfw.jar
+ export BOOTCLASSPATH /system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar
# Backward compatibility
symlink /system/etc /etc