initrd: delay the stage of setup_dpi

Move setup_dpi after detect_hardware so that a target can customize dpi
based on the detection result.

diff --git a/initrd/init b/initrd/init
index 2f291dc..2ca87a1 100755 (executable)
--- a/initrd/init
+++ b/initrd/init
@@ -165,6 +165,7 @@ load_modules
 mount_data
 mount_sdcard
 setup_tslib
+setup_dpi
 post_detect
 
 if [ -n "$DEBUG" ]; then

diff --git a/initrd/scripts/4-dpi b/initrd/scripts/4-dpi
index 86c54d5..9d182f7 100644 (file)
--- a/initrd/scripts/4-dpi
+++ b/initrd/scripts/4-dpi
@@ -1,10 +1,17 @@
 #
 # By Chih-Wei Huang <cwhuang@linux.org.tw>
-# Last updated 2010/10/14
+# Last updated 2012/02/08
 #
 # License: GNU Public License
 # We explicitely grant the right to use the scripts
 # with Android-x86 project.
 #
 
-[ -n "$DPI" ] && echo ro.sf.lcd_density=$DPI >> default.prop
+setup_dpi()
+{
+       if [ -n "$DPI" ]; then
+               grep -v ro.sf.lcd_density default.prop > tmp.prop
+               echo ro.sf.lcd_density=$DPI >> tmp.prop
+               mv tmp.prop default.prop
+       fi
+}