merge in ics-mr1-release history after reset to ics-mr1
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);