commit 1b0b88b5e1f97ec027857a991943449c8cc78684
author Rom Lemarchand <romlem@android.com> Sun Nov 08 17:51:50 2015 -0800
committer Rom Lemarchand <romlem@google.com> Mon Nov 16 08:53:51 2015 -0800
tree 87d6c045e1ebfa65c043f2c8b9d5bcb7c20d7aaa
parent 8ec2cc90c2f72fb1273f48a1b0b5cd3a1930a6be

init: skip "name" DT entry

DTs have a standard "name" entry which is not to be
turned into an android property, so skip it.

Change-Id: I79f6638b4123358c8d80510c1666cf5d4561160e
(cherry picked from commit 1dcf325844df54a3a2d274f37dea8dd676391eed)

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 93fe944..10fb04d 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -832,8 +832,9 @@
 
     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;
+        }
 
         file_name = android::base::StringPrintf("%s/%s", android_dir, dp->d_name);