commit f134ee366f4dbea3b508176f8165fe7c54a398c0
author Benoit Goby <benoit@android.com> Fri Jan 13 11:46:51 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 13 11:46:51 2012 -0800
tree 65fafa94dd1973a585fd61997fac9fbf38b1109c
parent 032afc1d52289f486538c9ed53f17b9889ea94df
parent 01c76f540054b3f5849da1d557fd2c477b876356

Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" into ics-mr1

init/init.c

diff --git a/init/init.c b/init/init.c
index d10ca47..165fea0 100755
--- a/init/init.c
+++ b/init/init.c
@@ -65,6 +65,7 @@
 static char carrier[32];
 static char bootloader[32];
 static char hardware[32];
+static char modelno[32];
 static unsigned revision = 0;
 static char qemu[32];
 
@@ -447,6 +448,8 @@
             strlcpy(bootloader, value, sizeof(bootloader));
         } else if (!strcmp(name,"androidboot.hardware")) {
             strlcpy(hardware, value, sizeof(hardware));
+        } else if (!strcmp(name,"androidboot.modelno")) {
+            strlcpy(modelno, value, sizeof(modelno));
         }
     } else {
         /* in the emulator, export any kernel option with the
@@ -596,6 +599,9 @@
     property_set("ro.carrier", carrier[0] ? carrier : "unknown");
     property_set("ro.bootloader", bootloader[0] ? bootloader : "unknown");
 
+    if (modelno[0])
+        property_set("ro.boot.modelno", modelno);
+
     property_set("ro.hardware", hardware);
     snprintf(tmp, PROP_VALUE_MAX, "%d", revision);
     property_set("ro.revision", tmp);