diff --git a/build/boot/initrd/init b/build/boot/initrd/init index 5e9dfd4..f415c93 100755 --- a/build/boot/initrd/init +++ b/build/boot/initrd/init @@ -133,8 +133,10 @@ fi # load default value +[ -z $ppp_mode ] && ppp_mode=0 [ -z $sd_boost ] && sd_boost=0 -[ -z $a2sd_mode ] && a2sd_mode="none" +[ -z $a2sd_mode ] && a2sd_mode="dalvik" +[ -z $gps_zone ] && gps_zone="us" echo "+++++++ MOUNTING MTD SYSTEM +++++++" # define partitions @@ -181,6 +183,7 @@ if [ -d /sys/block/mmcblk0/mmcblk0p2 ] ; then echo "+++++++ Default a2sd ACTVATED +++++++" >> $init_log echo "+++++++ Default a2sd ACTVATED +++++++" rm -rf /data/.noa2sd + rm -rf /data/.datasd touch /data/.dalvikcache fi diff --git a/build/boot/initrd/init.rc b/build/boot/initrd/init.rc index 3c8727e..f816c4e 100755 --- a/build/boot/initrd/init.rc +++ b/build/boot/initrd/init.rc @@ -426,7 +426,7 @@ service debuggerd /system/bin/debuggerd -service ril-daemon /system/bin/rild -l /system/lib/libhtc_ril_wrapper.so -- -d /dev/smd0 nand_init +service ril-daemon /system/bin/rild -l /system/lib/libhtc_ril_wrapper.so -- -d /dev/smd0 nand_init socket rild stream 660 root radio socket rild-debug stream 660 radio system user root diff --git a/build/boot/zImage b/build/boot/zImage index 0a71a64..bf3527c 100755 Binary files a/build/boot/zImage and b/build/boot/zImage differ diff --git a/build/system/etc/init.d/00start b/build/system/etc/init.d/00start index 99cc2ab..9c18646 100755 --- a/build/system/etc/init.d/00start +++ b/build/system/etc/init.d/00start @@ -7,6 +7,6 @@ echo " "; echo "Visit "; echo " XDA-Developers "; echo " "; -echo " -=MDJ=- "; +echo " arif-ali "; echo " "; exit; diff --git a/build/system/etc/init.d/02recov b/build/system/etc/init.d/02recov new file mode 100755 index 0000000..3ca65c0 --- /dev/null +++ b/build/system/etc/init.d/02recov @@ -0,0 +1,56 @@ +#!/system/bin/sh + +cache_partition=`grep cache /proc/mtd | cut -d: -f1 | sed 's/mtd/mtdblock/'` +mountpoint=`mount | grep ${cache_partition} | awk '{print $3}'` + +# make / writeable so that I can modifications +mount -o rw,remount / + +if [ -h /cache ] ; then + # /cache is a symbolic link + mkdir /mnt/cache + mount -t yaffs2 -o rw /dev/block/$cache_partition /mnt/cache + if [ ! -d /mnt/cache/recovery ] ; then + mkdir /mnt/cache/recovery + mv /cache/recovery/* /mnt/cache/recovery/. + fi + rm -rf /cache/recovery + ln -s /mnt/cache/recovery /cache/recovery +elif [ -d /cache ] ; then + # /cache is a directory + if [ "$mountpoint" = "/cache" ] ; then + # /cache is mounted in the right place + # do nothing, other than permissions at the end of this script + else + # the block device is not mounted or, is mounted somewhere else + umount ${mountpoint} + mkdir /mnt/cache + mount -t yaffs2 -o rw /dev/block/$cache_partition /mnt/cache + if [ ! -d /mnt/cache/recovery ] ; then + mkdir /mnt/cache/recovery + mv /cache/recovery/* /mnt/cache/recovery/. + fi + rm -rf /cache/recovery + umount /mnt/cache + rmdir /mnt/cache + mount -t yaffs2 -o rw /dev/block/$cache_partition /cache + fi +elif [ ! -e /cache ] ; then + # the /cache doesn't exist + mkdir /cache + mount -t yaffs2 -o rw /dev/block/${cache_partition} /cache +fi + +# change permission to 0.0 so market place can access /cache +chown 0.0 /cache +if [ ! -e /cache/recovery ] ; then + mkdir /cache/recovery +fi + +# change permission for recovery directory so +# ROM Manager and CWM can access it +chown 1000.2001 /cache/recovery +chmod 0770 /cache/recovery + +# back to read-only mode +mount -o ro,remount / diff --git a/build/system/etc/init.d/97ppp b/build/system/etc/init.d/97ppp index 8c2b3b9..d7fb085 100755 --- a/build/system/etc/init.d/97ppp +++ b/build/system/etc/init.d/97ppp @@ -1,7 +1,6 @@ #!/system/bin/sh chown 1001.1001 /dev/smd1; -touch /etc/ppp/active; touch /etc/ppp/pap-secrets; touch /etc/ppp/chap-secrets; touch /etc/ppp/options.smd; @@ -13,5 +12,18 @@ chown 0.0 /system/bin/pppd; chmod 4755 /system/bin/pppd; #/system/bin/pppd /dev/smd1 defaultroute; -# Create link for resolv.conf (generated by pppd) -ln -s /etc/ppp/resolv.conf /etc/resolv.conf +if [ -f /system/ppp ] +then + echo "PPP enabled, doing PPP specific stuff" + + # Create link for resolv.conf (generated by pppd) + ln -s /etc/ppp/resolv.conf /etc/resolv.conf + + # Tweak kernel low memory handling + echo 8 8 > /proc/sys/vm/lowmem_reserve_ratio + echo 8192 > /proc/sys/vm/min_free_kbytes + +else + echo "PPP disbled, leaving things as they are" +fi + diff --git a/build/system/etc/ppp/ip-up b/build/system/etc/ppp/ip-up index 4618add..441c7a6 100755 --- a/build/system/etc/ppp/ip-up +++ b/build/system/etc/ppp/ip-up @@ -25,6 +25,8 @@ NAME=${LINKNAME:-"$1"} /bin/touch /etc/ppp/ppp0.pid /bin/chmod 777 /etc/ppp/ppp0.pid /bin/echo $(pidof pppd) > /etc/ppp/ppp0.pid +echo "nameserver $DNS1" > /etc/ppp/resolv.conf +echo "nameserver $DNS2" >> /etc/ppp/resolv.conf /system/bin/setprop "net.$NAME.dns1" "$DNS1" /system/bin/setprop "net.$NAME.dns2" "$DNS2" diff --git a/build/system/lib/modules/bcm4329.ko b/build/system/lib/modules/bcm4329.ko index 9830019..c8d8640 100644 Binary files a/build/system/lib/modules/bcm4329.ko and b/build/system/lib/modules/bcm4329.ko differ diff --git a/build/system/lib/modules/cifs.ko b/build/system/lib/modules/cifs.ko index 5d98001..5b3f176 100644 Binary files a/build/system/lib/modules/cifs.ko and b/build/system/lib/modules/cifs.ko differ diff --git a/build/system/lib/modules/fuse.ko b/build/system/lib/modules/fuse.ko index 96b8c9f..a60b3ae 100644 Binary files a/build/system/lib/modules/fuse.ko and b/build/system/lib/modules/fuse.ko differ diff --git a/build/system/lib/modules/msm_rmnet.ko b/build/system/lib/modules/msm_rmnet.ko index 300fda2..6573ae5 100644 Binary files a/build/system/lib/modules/msm_rmnet.ko and b/build/system/lib/modules/msm_rmnet.ko differ diff --git a/build/system/lib/modules/nls_utf8.ko b/build/system/lib/modules/nls_utf8.ko index eabd147..61c65af 100644 Binary files a/build/system/lib/modules/nls_utf8.ko and b/build/system/lib/modules/nls_utf8.ko differ diff --git a/build/system/lib/modules/tun.ko b/build/system/lib/modules/tun.ko index c75dda3..6065295 100644 Binary files a/build/system/lib/modules/tun.ko and b/build/system/lib/modules/tun.ko differ diff --git a/scripts/createROM.sh b/scripts/createROM.sh index 66b5279..e84c6df 100755 --- a/scripts/createROM.sh +++ b/scripts/createROM.sh @@ -1,6 +1,6 @@ #!/bin/bash -VER=2.5 +VER=2.5.1 ROM=Froyo_Sense_Revolution BUILD1_NAME=${ROM}_${VER}_CWM @@ -166,7 +166,7 @@ createCWM() genInitrd popd > /dev/null 2>&1 cp META-INF/com/google/android/updater-script.std META-INF/com/google/android/updater-script - rm -rf system/etc/init.d/00setup + rm -rf system/app/ROMManager.apk rm -rf ../${BUILD1_NAME}.zip echo -n "Creating CWM zip file ... " zip -9Dry -q ../${BUILD1_NAME}.zip * @@ -219,12 +219,12 @@ genInitrd() pushd ${BUILD1}/boot/initrd > /dev/null 2>&1 chmod 770 bin/* - if [[ "$1" == "LK" ]] ; then - mv init.android init - pushd sbin > /dev/null 2>&1 - ln -sf ../init ueventd - popd > /dev/null 2>&1 - fi +# if [[ "$1" == "LK" ]] ; then +# mv init.android init +# pushd sbin > /dev/null 2>&1 +# ln -sf ../init ueventd +# popd > /dev/null 2>&1 +# fi find .|cpio --quiet -H newc -o|gzip -9 -c - > ../initrd.gz @@ -250,11 +250,11 @@ echo if [[ `echo $0 | grep createInitrd.sh` ]]; then -if [[ "$1" == "LK" ]] ; then - genInitrd LK -else +#if [[ "$1" == "LK" ]] ; then +# genInitrd LK +#else genInitrd -fi +#fi fi