commit f30142b3019d49d2a4efc081346d908b3384b01c
author Rom Lemarchand <romlem@android.com> Mon Nov 09 17:46:33 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 17:46:33 2015 +0000
tree 5315014027cb411c91df32257061c639da55257e
parent d3e8b597e89df81fa6a3374d0856c6a1d3879fb1
parent 27c0c87b542681efa057aa364db0a1026dd71dce

Merge "init: skip "name" DT entry" am: 24e3b8d091 am: b95031f87a
am: ca4c088214

* commit 'ca4c088214bf93e984fa3929afdbdff935cd6896':
  init: skip "name" DT entry

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index a898b03..605674b 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -386,7 +386,7 @@
 
     struct dirent *dp;
     while ((dp = readdir(dir.get())) != NULL) {
-        if (dp->d_type != DT_REG || !strcmp(dp->d_name, "compatible")) {
+        if (dp->d_type != DT_REG || !strcmp(dp->d_name, "compatible") || !strcmp(dp->d_name, "name")) {
             continue;
         }